Source: git, mercurial
Control: found -1 git/1:2.33.1-1
Control: found -1 mercurial/5.9.3-1
Severity: serious
Tags: sid bookworm
X-Debbugs-CC: debian-ci@lists.debian.org
User: debian-ci@lists.debian.org
Usertags: breaks needs-update
Dear maintainer(s),
With a recent upload of git the autopkgtest of mercurial 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.33.1-1
mercurial from testing 5.9.3-1
all others from testing from testing
I copied some of the output at the bottom of this report.
Currently this regression is blocking the migration of git to testing
[1]. Due to the nature of this issue, I filed this bug report against
both packages. Can you please investigate the situation and reassign the
bug to the right package?
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/m/mercurial/16479536/log.gz
---
/tmp/autopkgtest-lxc.z9mlql5c/downtmp/build.H05/src/tests/test-convert-git.t
+++
/tmp/autopkgtest-lxc.z9mlql5c/downtmp/build.H05/src/tests/test-convert-git.t.err
@@ -51,43 +51,40 @@
$ commit -a -m t4.2
$ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit . other > /dev/null 2>/dev/null
+ [128]
$ commit -m 'Merge branch other'
+ git commit error
$ cd ..
$ hg convert --config extensions.progress= --config
progress.assume-tty=1 \
> --config progress.delay=0 --config progress.changedelay=0 \
> --config progress.refresh=0 --config progress.width=60 \
> --config progress.format='topic, bar, number' --datesort git-repo
\r (no-eol) (esc)
- scanning [======> ] 1/6\r
(no-eol) (esc)
- scanning [=============> ] 2/6\r
(no-eol) (esc)
- scanning [=====================> ] 3/6\r
(no-eol) (esc)
- scanning [============================> ] 4/6\r
(no-eol) (esc)
- scanning [===================================> ] 5/6\r
(no-eol) (esc)
- scanning [===========================================>] 6/6\r
(no-eol) (esc)
- \r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [ ] 0/6\r
(no-eol) (esc)
+ scanning [=======> ] 1/5\r
(no-eol) (esc)
+ scanning [================> ] 2/5\r
(no-eol) (esc)
+ scanning [=========================> ] 3/5\r
(no-eol) (esc)
+ scanning [==================================> ] 4/5\r
(no-eol) (esc)
+ scanning [===========================================>] 5/5\r
(no-eol) (esc)
+ \r
(no-eol) (esc)
+ \r (no-eol) (esc)
+ converting [ ] 0/5\r
(no-eol) (esc)
getting files [==================> ] 1/2\r
(no-eol) (esc)
getting files [======================================>] 2/2\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [======> ] 1/6\r
(no-eol) (esc)
+ converting [=======> ] 1/5\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [=============> ] 2/6\r
(no-eol) (esc)
+ converting [===============> ] 2/5\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [====================> ] 3/6\r
(no-eol) (esc)
+ converting [========================> ] 3/5\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [===========================> ] 4/6\r
(no-eol) (esc)
- getting files [======================================>] 1/1\r
(no-eol) (esc)
- \r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [==================================> ] 5/6\r
(no-eol) (esc)
+ converting [================================> ] 4/5\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
assuming destination git-repo-hg
@@ -95,25 +92,23 @@
scanning source...
sorting...
converting...
- 5 t1
- 4 t2
- 3 t3
- 2 t4.1
- 1 t4.2
- 0 Merge branch other
+ 4 t1
+ 3 t2
+ 2 t3
+ 1 t4.1
+ 0 t4.2
updating bookmarks
$ hg up -q -R git-repo-hg
$ hg -R git-repo-hg tip -v
- changeset: 5:c78094926be2
- bookmark: master
- tag: tip
- parent: 3:f5f5cb45432b
- parent: 4:4e174f80c67c
+ changeset: 4:4e174f80c67c
+ bookmark: other
+ tag: tip
+ parent: 2:6719626e5dfd
user: test <test@example.org>
- date: Mon Jan 01 00:00:15 2007 +0000
+ date: Mon Jan 01 00:00:14 2007 +0000
files: a
description:
- Merge branch other
+ t4.2
$ count=10
@@ -138,15 +133,20 @@
$ commit -a -m 'add baz'
$ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null
+ [128]
$ commit -m 'Octopus merge'
+ git commit error
$ echo bar >> bar
$ commit -a -m 'change bar'
+ git commit error
$ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null
$ echo >> foo
$ commit -a -m 'change foo'
$ git checkout master >/dev/null 2>/dev/null
$ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null
+ [128]
$ commit -m 'Discard change to foo'
+ git commit error
$ cd ..
$ glog()
> {
@@ -178,143 +178,90 @@
> --config progress.refresh=0 --config progress.width=60 \
> --config progress.format='topic, bar, number'
\r (no-eol) (esc)
- scanning [===> ] 1/9\r
(no-eol) (esc)
- scanning [========> ] 2/9\r
(no-eol) (esc)
- scanning [=============> ] 3/9\r
(no-eol) (esc)
- scanning [==================> ] 4/9\r
(no-eol) (esc)
- scanning [=======================> ] 5/9\r
(no-eol) (esc)
- scanning [============================> ] 6/9\r
(no-eol) (esc)
- scanning [=================================> ] 7/9\r
(no-eol) (esc)
- scanning [======================================> ] 8/9\r
(no-eol) (esc)
- scanning [===========================================>] 9/9\r
(no-eol) (esc)
- \r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [ ] 0/9\r
(no-eol) (esc)
+ scanning [======> ] 1/6\r
(no-eol) (esc)
+ scanning [=============> ] 2/6\r
(no-eol) (esc)
+ scanning [=====================> ] 3/6\r
(no-eol) (esc)
+ scanning [============================> ] 4/6\r
(no-eol) (esc)
+ scanning [===================================> ] 5/6\r
(no-eol) (esc)
+ scanning [===========================================>] 6/6\r
(no-eol) (esc)
+ \r
(no-eol) (esc)
+ \r (no-eol) (esc)
+ converting [ ] 0/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [===> ] 1/9\r
(no-eol) (esc)
+ converting [======> ] 1/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [========> ] 2/9\r
(no-eol) (esc)
+ converting [=============> ] 2/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [=============> ] 3/9\r
(no-eol) (esc)
+ converting [====================> ] 3/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [=================> ] 4/9\r
(no-eol) (esc)
+ converting [===========================> ] 4/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
\r (no-eol) (esc)
- converting [======================> ] 5/9\r
(no-eol) (esc)
- getting files [===> ] 1/8\r
(no-eol) (esc)
- getting files [========> ] 2/8\r
(no-eol) (esc)
- getting files [=============> ] 3/8\r
(no-eol) (esc)
- getting files [==================> ] 4/8\r
(no-eol) (esc)
- getting files [=======================> ] 5/8\r
(no-eol) (esc)
- getting files [============================> ] 6/8\r
(no-eol) (esc)
- getting files [=================================> ] 7/8\r
(no-eol) (esc)
- getting files [======================================>] 8/8\r
(no-eol) (esc)
- \r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [===========================> ] 6/9\r
(no-eol) (esc)
+ converting [==================================> ] 5/6\r
(no-eol) (esc)
getting files [======================================>] 1/1\r
(no-eol) (esc)
\r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [===============================> ] 7/9\r
(no-eol) (esc)
- getting files [======================================>] 1/1\r
(no-eol) (esc)
- \r
(no-eol) (esc)
- \r (no-eol) (esc)
- converting [====================================> ] 8/9\r
(no-eol) (esc)
- getting files [==================> ] 1/2\r
(no-eol) (esc)
- getting files [======================================>] 2/2\r
(no-eol) (esc)
- \r
(no-eol) (esc)
initializing destination fullrepo repository
scanning source...
sorting...
converting...
- 8 add foo
- 7 change foo
- 6 add quux
- 5 add bar
- 4 add baz
- 3 Octopus merge
- 2 change bar
- 1 change foo
- 0 Discard change to foo
+ 5 add foo
+ 4 change foo
+ 3 add quux
+ 2 add bar
+ 1 add baz
+ 0 change foo
updating bookmarks
$ hg up -q -R fullrepo
$ glog -R fullrepo
- @ 9 "Discard change to foo" files: foo
- |\
- | o 8 "change foo" files: foo
+ @ 5 "change foo" files: foo
+ |
+ | o 4 "add baz" files: baz
| |
- o | 7 "change bar" files: bar
+ | | o 3 "add bar" files: bar
+ | |/
+ | o 2 "add quux" files: quux
|/
- o 6 "(octopus merge fixup)" files:
- |\
- | o 5 "Octopus merge" files: baz
- | |\
- o | | 4 "add baz" files: baz
- | | |
- +---o 3 "add bar" files: bar
- | |
- o | 2 "add quux" files: quux
- | |
| o 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
$ hg -R fullrepo manifest --debug
- 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar
- 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
- 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
- 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux
+ 89d98a7032b6c3b00c27fb422c4fb2447fe5cb82 644 foo
$ splitrepo 'octopus merge' 'foo bar baz'
% foo bar baz: octopus merge
- @ 8 "Discard change to foo" files: foo
- |\
- | o 7 "change foo" files: foo
- | |
- o | 6 "change bar" files: bar
+ @ 4 "change foo" files: foo
+ |
+ | o 3 "add baz" files: baz
|/
- o 5 "(octopus merge fixup)" files:
- |\
- | o 4 "Octopus merge" files: baz
- | |\
- o | | 3 "add baz" files: baz
- | | |
- +---o 2 "add bar" files: bar
- | |
+ | o 2 "add bar" files: bar
+ |/
| o 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
- 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar
- 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
- 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
+ 89d98a7032b6c3b00c27fb422c4fb2447fe5cb82 644 foo
$ splitrepo 'only some parents of an octopus merge; "discard" a head'
'foo baz quux'
% foo baz quux: only some parents of an octopus merge; "discard" a head
- @ 6 "Discard change to foo" files: foo
+ @ 4 "change foo" files: foo
|
- o 5 "change foo" files: foo
- |
- o 4 "Octopus merge" files:
- |\
| o 3 "add baz" files: baz
| |
| o 2 "add quux" files: quux
- | |
- o | 1 "change foo" files: foo
+ |/
+ | o 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
- 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
- 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
- 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux
+ 89d98a7032b6c3b00c27fb422c4fb2447fe5cb82 644 foo
test importing git renames and copies
@@ -323,10 +270,18 @@
since bar is not touched in this commit, this copy will not be detected
$ cp bar bar-copied
$ cp baz baz-copied
+ cp: cannot stat 'baz': $ENOENT$
+ [1]
$ cp baz baz-copied2
+ cp: cannot stat 'baz': $ENOENT$
+ [1]
$ cp baz ba-copy
+ cp: cannot stat 'baz': $ENOENT$
+ [1]
$ echo baz2 >> baz
$ git add bar-copied baz-copied baz-copied2 ba-copy
+ fatal: pathspec 'baz-copied' did not match any files
+ [128]
$ commit -a -m 'rename and copy'
$ cd ..
@@ -343,14 +298,6 @@
$ hg -q convert --config convert.git.similarity=100 --datesort
git-repo2 fullrepo
$ hg -R fullrepo status -C --change master
- M baz
- A ba-copy
- baz
- A bar-copied
- A baz-copied
- baz
- A baz-copied2
- baz
A foo-renamed
foo
R foo
@@ -359,12 +306,13 @@
(there was a bug where if the copy dest was alphabetically prior to the
copy
source, the copy source took the contents of the copy dest)
$ hg cat -r tip fullrepo/baz
- baz
- baz2
+ fullrepo/baz: no such file in rev 2420880917b1
+ [1]
$ cd git-repo2
$ echo bar2 >> bar
$ commit -a -m 'change bar'
+ git commit error
$ cp bar bar-copied2
$ git add bar-copied2
$ commit -a -m 'copy with no changes'
@@ -374,7 +322,6 @@
> --config convert.git.findcopiesharder=1 --datesort git-repo2 fullrepo
$ hg -R fullrepo status -C --change master
A bar-copied2
- bar
renamelimit config option works
ERROR: test-convert-git.t output changed
!# Timout reached for process 36153 # Ret was: 0 (test-convert-git.t)
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature