Bug#1001002: hg-git: autopkgtest needs update for new version of git: Merge made by the 'ort' strategy.

[Paul Gevers <elbrus@debian.org>]

Source: hg-git
Version: 0.10.3-1
Severity: serious
X-Debbugs-CC: debian-ci@lists.debian.org, git@packages.debian.org
Tags: sid bookworm
User: debian-ci@lists.debian.org
Usertags: needs-update
Control: affects -1 src:git

Dear maintainer(s),

With a recent upload of git the autopkgtest of hg-git fails in testing 
when that autopkgtest is run with the binary packages of git from 
unstable. It passes when run with only packages from testing. In tabular 
form:

                       pass            fail
git                    from testing    1:2.34.1-1
hg-git                 from testing    0.10.3-1
all others             from testing    from testing

I copied some of the output at the bottom of this report. It seems it's 
just an update to the references.

Currently this regression is blocking the migration of git to testing [1].

More information about this bug and the reason for filing it can be found on
https://wiki.debian.org/ContinuousIntegration/RegressionEmailInformation

Paul

[1] https://qa.debian.org/excuses.php?package=git

https://ci.debian.net/data/autopkgtest/testing/amd64/h/hg-git/17203083/log.gz

no username found, using 'debci@ci-336-b20c10fe' instead
cd tests && /usr/bin/python3 run-tests.py --with-hg=/usr/bin/hg 
--blacklist=/tmp/autopkgtest-lxc.1f6s3uky/downtmp/build.hWn/src/debian/hg-git.test_blacklist
running 51 tests using 48 parallel processes ssss.s......
--- /tmp/autopkgtest-lxc.1f6s3uky/downtmp/build.hWn/src/tests/test-merge.t
+++ 
/tmp/autopkgtest-lxc.1f6s3uky/downtmp/build.hWn/src/tests/test-merge.t.err
@@ -22,7 +22,7 @@
  clean merge
   $ git merge -m "Merge branch 'beta'" beta | sed "s/the '//;s/' 
strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 
's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| 
*/| /'
-  Merge successful
+  Merge made by ort.
    beta | 1 +
    1 file changed, 1 insertion(+)
    create mode 100644 beta

ERROR: test-merge.t output changed
!.............................
--- /tmp/autopkgtest-lxc.1f6s3uky/downtmp/build.hWn/src/tests/test-pull.t
+++ 
/tmp/autopkgtest-lxc.1f6s3uky/downtmp/build.hWn/src/tests/test-pull.t.err
@@ -127,7 +127,7 @@
 add a merge to the git repo
   $ cd gitrepo
   $ git merge -m "Merge branch 'beta'" beta | sed 's/|  */| /'
-  Merge made by the 'recursive' strategy.
+  Merge made by the 'ort' strategy.
    beta | 1 +
    1 file changed, 1 insertion(+)
    create mode 100644 beta

ERROR: test-pull.t output changed
!........
Skipped test-check-pyflakes.t: missing feature: Pyflakes python linter
Skipped test-encoding.t: blacklisted
Skipped test-gitignore-windows.t: missing feature: Windows
Skipped test-incoming.t: blacklisted
Skipped test-networking.t: skipped
Failed test-merge.t: output changed
Failed test-pull.t: output changed
# Ran 46 tests, 5 skipped, 2 failed.
python hash seed: 3023368748
make: *** [Makefile:15: tests] Error 1
autopkgtest [05:11:39]: test testsuite

Attachment: OpenPGP_signature
Description: OpenPGP digital signature