Hi Samo, On Fri, Oct 25, 2024 at 03:09:04PM +0200, Samo Pogačnik wrote: > I prepared initial update of our package against newer upstream release 0.4.9 > in: https://salsa.debian.org/spog/git-subrepo/-/tree/debian/sid > > You may inspect the salsa pipeline build in > https://salsa.debian.org/spog/git-subrepo/-/tree/debian/sid_force, where > changelog has also been committed.
You don't have to do it like that, you can commit the changelog entry as UNRELEASED to the debian/sid branch without any process problems. Avoid setting the distribution to unstable however as sponsor will usually do that :-) > I notified upstream about the update via a new pull request and informed > them of what we are trying to achieve. It's good to link to the discussion: https://github.com/ingydotnet/git-subrepo/pull/637 You make no mention of the test environment hacks just hiding the real problem. Personally I couldn't use git-subrepo in it's current state because my config is actively interfering as we've seen and frankly it's also not making me very enthusiastic about continuing to work on the Debian package as I consider this state basically unfit for release. I have half a mind to open an RC bug against git-subrepo to keep it out of testing until this is resolved but I don't want your hard work to go to waste. The tests are still very slow (feels like they got slower still since last time): > Files=39, Tests=341, 320 wallclock secs ( 0.15 usr 0.05 sys + 43.01 cusr > 32.41 csys = 75.62 CPU) 320 seconds, 5+min! Only seems to happen in the sbuild chroot, debuild is way faster (64 secs) but some tests fail instead probably due to the known enviornmental issues. Anyway, pushed and uploaded. Please have a look at how we can mitigate the environment problem properly in git-subrepo without hacks in the testsuite (or get upstream to do it ;) I think the right way to go about that would be to send a PR with failing tests demonstrating the problem. I believe all you need is in my previous mail dissecting what config is causing the issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1078960#25 There's an existing upstream issues you can reference too: https://github.com/ingydotnet/git-subrepo/issues/550 This shouldn't be too hard -c merge.ff=yes/no -c pull.ff=yes/no in the right places and we're golden. I'll leave the detailed analysys to you ;P Thanks, --Daniel Failing tests with `debuild -uc -us` on my bookworm workstation: test/branch-all.t .................. ok test/branch-rev-list-one-path.t .... ok test/branch-rev-list.t ............. ok test/branch.t ...................... ok test/clean.t ....................... ok test/clone-annotated-tag.t ......... ok # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1287494 2024-11-09 22:21:09.367743207 +0100 +++ /tmp/got-1287494 2024-11-09 22:21:09.367743207 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1287494 5 32 208 /tmp/got-1287494 10 64 414 total test/clone.t ....................... Failed 1/21 subtests test/compile.t ..................... ok test/config.t ...................... ok test/encode.t ...................... ok test/error.t ....................... ok test/fetch.t ....................... ok # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1304105 2024-11-09 22:21:34.176206717 +0100 +++ /tmp/got-1304105 2024-11-09 22:21:34.176206717 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1304105 5 32 208 /tmp/got-1304105 10 64 414 total test/gitignore.t ................... Failed 1/9 subtests # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1304645 2024-11-09 22:21:34.524213190 +0100 +++ /tmp/got-1304645 2024-11-09 22:21:34.524213190 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1304645 5 32 208 /tmp/got-1304645 10 64 414 total test/init.t ........................ Failed 1/20 subtests test/issue29.t ..................... ok test/issue95.t ..................... ok test/issue96.t ..................... ok test/pull-all.t .................... ok test/pull-merge.t .................. ok test/pull-message.t ................ ok # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1311350 2024-11-09 22:21:44.776403526 +0100 +++ /tmp/got-1311350 2024-11-09 22:21:44.776403526 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1311350 5 32 208 /tmp/got-1311350 10 64 414 total # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1311350 2024-11-09 22:21:45.192411235 +0100 +++ /tmp/got-1311350 2024-11-09 22:21:45.192411235 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1311350 5 32 208 /tmp/got-1311350 10 64 414 total test/pull-new-branch.t ............. Failed 2/13 subtests test/pull-ours.t ................... ok test/pull-theirs.t ................. ok test/pull-twice.t .................. ok test/pull-worktree.t ............... ok # Failed test 'Comment header block is correct' # at test/setup line 182. --- /tmp/want-1315858 2024-11-09 22:21:53.020556092 +0100 +++ /tmp/got-1315858 2024-11-09 22:21:53.016556017 +0100 @@ -1,5 +1,5 @@ ; DO NOT EDIT (unless you know what you are doing) ; ; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; 5 32 206 /tmp/want-1315858 5 32 208 /tmp/got-1315858 10 64 414 total test/pull.t ........................ Failed 1/14 subtests test/push-after-init.t ............. ok # Failed test 'Output OK: Check that 'push' after an empty push works.' # at test/push-after-push-no-changes.t line 20. # got: 'Subrepo 'bar' has no new commits to push.' # expected: 'Subrepo 'bar' pushed to '/home/dxld/share/dev/deb/pkg/git-subrepo/test/tmp/upstream/bar' (master).' test/push-after-push-no-changes.t .. Failed 1/1 subtests test/push-force.t .................. ok test/push-new-branch.t ............. ok test/push-no-changes.t ............. ok test/push-squash.t ................. ok test/push.t ........................ ok # Failed test 'subrepo detected merge point' # at test/rebase.t line 57. # Got: 'Removed branch 'subrepo/bar'. # git-subrepo: Command failed: 'git branch subrepo/bar '. # fatal: not a valid object name: ''' test/rebase.t ...................... Failed 1/1 subtests # Failed test at test/reclone.t line 45. # got: 'Subrepo 'bar' option 'branch' has value 'refs/tags/A'.' # expected: 'Subrepo 'bar' option 'branch' has value 'master'.' test/reclone.t ..................... Failed 1/6 subtests test/shellcheck.t .................. skipped: This test wants shellcheck version 0.7.1 test/status.t ...................... ok test/submodule.t ................... ok test/zsh.t ......................... skipped: The 'docker' utility is not installed Test Summary Report ------------------- test/clone.t (Wstat: 0 Tests: 21 Failed: 1) Failed test: 14 test/gitignore.t (Wstat: 0 Tests: 9 Failed: 1) Failed test: 4 test/init.t (Wstat: 0 Tests: 20 Failed: 1) Failed test: 8 test/pull-new-branch.t (Wstat: 0 Tests: 13 Failed: 2) Failed tests: 1, 7 test/pull.t (Wstat: 0 Tests: 14 Failed: 1) Failed test: 4 test/push-after-push-no-changes.t (Wstat: 0 Tests: 1 Failed: 1) Failed test: 1 test/rebase.t (Wstat: 0 Tests: 1 Failed: 1) Failed test: 1 test/reclone.t (Wstat: 0 Tests: 6 Failed: 1) Failed test: 5 Files=39, Tests=341, 64 wallclock secs ( 0.16 usr 0.05 sys + 39.87 cusr 27.80 csys = 67.88 CPU) Result: FAIL
signature.asc
Description: PGP signature
