Comments
Patch
@@ -245,15 +245,15 @@
sorting...
converting...
2 adda
- 1 addb
- 0 changea
+ 1 changea
+ 0 addb
updating tags
$ (cd repo-bzr; glog)
o 3@default "update tags" files+: [.hgtags], files-: [], files: []
|
- o 2@default "changea" files+: [], files-: [], files: [a]
- |
- | o 1@branch "addb" files+: [b], files-: [], files: []
+ | o 2@branch "addb" files+: [b], files-: [], files: []
+ | |
+ o | 1@default "changea" files+: [], files-: [], files: [a]
|/
o 0@default "adda" files+: [a], files-: [], files: []
@@ -263,7 +263,7 @@
$ hg -R repo-bzr tags
tip 3:* (glob)
- branch-tag 1:* (glob)
+ branch-tag 2:b195fd936fa2
trunk-tag 0:* (glob)
Nested repositories (issue3254)
@@ -282,6 +282,6 @@
sorting...
converting...
2 adda
- 1 addb
- 0 changea
+ 1 changea
+ 0 addb
updating tags
Hi guys, We (Ubuntu) have flaky results with test-convert-bzr.t since we have updated to 6.1.1 from 6.0.1. When launched locally, I can easily reproduce the flakiness, the test will succeed 2 out of 3 times, and will fail otherwise with the following result: $ make test-convert-bzr.t TESTFLAGS="--verbose --timeout 1440 --blacklist=$(pwd)/debian/mercurial.test_blacklist" PYTHON=python3 cd tests && python3 run-tests.py --verbose --timeout 1440 --blacklist=/home/alex/work/package/mercurial/mercurial-6.1.1/debian/mercurial.test_blacklist test-convert-bzr.t # Found prerequisite diff at /usr/bin/diff # Found prerequisite grep at /usr/bin/grep # Found prerequisite unzip at /usr/bin/unzip # Found prerequisite gunzip at /usr/bin/gunzip # Found prerequisite bunzip2 at /usr/bin/bunzip2 # Found prerequisite sed at /usr/bin/sed # Using TESTDIR /home/alex/work/package/mercurial/mercurial-6.1.1/tests # Using RUNTESTDIR /home/alex/work/package/mercurial/mercurial-6.1.1/tests # Using HGTMP /tmp/hgtests.xzgxvfhg # Using PATH /tmp/hgtests.xzgxvfhg/custom-bin:/tmp/hgtests.xzgxvfhg/install/bin:/home/alex/work/package/mercurial/mercurial-6.1.1/tests:/home/alex/work/toolchain/gcc-11.1.0-nolibc/riscv32-linux/bin/:/home/alex/.webpaas-cli/bin:/usr/lib/ccache:/usr/local/bin:/home/alex/work/linux_development/kernel-patch:/home/alex/.local/bin:/opt/riscv/bin:/home/alex/bin/gcc-8.1.0-nolibc/riscv32-linux/bin/:/home/alex/bin:/home/alex/wip/riscv/bin:/home/alex/wip/riscv-gnu-toolchain/riscv-qemu/riscv64-softmmu:/home/alex/wip/riscv_toolchain/gcc-8.1.0-nolibc/riscv64-linux/bin:/home/alex/wip/riscv-gnu-toolchain/riscv-qemu/riscv64-softmmu:/home/alex/.local/bin:/home/alex/bin:/home/alex/work/toolchain/gcc-11.1.0-nolibc/riscv32-linux/bin/:/home/alex/.webpaas-cli/bin:/usr/lib/ccache:/usr/local/bin:/home/alex/work/linux_development/kernel-patch:/home/alex/.local/bin:/opt/riscv/bin:/home/alex/bin/gcc-8.1.0-nolibc/riscv32-linux/bin/:/home/alex/bin:/home/alex/wip/riscv/bin:/home/alex/wip/riscv-gnu-toolchain/riscv-qemu/riscv64-softmmu:/home/alex/wip/riscv_toolchain/gcc-8.1.0-nolibc/riscv64-linux/bin:/home/alex/wip/riscv-gnu-toolchain/riscv-qemu/riscv64-softmmu:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin # Using PYTHONPATH /tmp/hgtests.xzgxvfhg/install/lib/python:/home/alex/work/package/mercurial/mercurial-6.1.1/tests:/home/alex/work/package/mercurial/mercurial-6.1.1/tests # Writing to directory /home/alex/work/package/mercurial/mercurial-6.1.1/tests # Making python executable in test path a symlink to '/usr/bin/python3' # Performing temporary installation of HG # Running "/usr/bin/python3" setup.py clean --all build --build-base="/tmp/hgtests.xzgxvfhg/build" install --force --prefix="/tmp/hgtests.xzgxvfhg/install" --install-lib="/tmp/hgtests.xzgxvfhg/install/lib/python" --install-scripts="/tmp/hgtests.xzgxvfhg/install/bin" --home="" >/tmp/hgtests.xzgxvfhg/install.err 2>&1 running 1 tests using 1 parallel processes test-convert-bzr.t test-convert-bzr.t ... # Test test-convert-bzr.t # Running sh "/tmp/hgtests.xzgxvfhg/child1/test-convert-bzr.t.sh" ERROR: test-convert-bzr.t output changed !# Ret was: 0 (test-convert-bzr.t) Failed test-convert-bzr.t: output changed # Ran 1 tests, 0 skipped, 1 failed. python hash seed: 251203041 # Timout reached for process 531072 # Cleaning up HGTMP /tmp/hgtests.xzgxvfhg make: *** [Makefile:145: test-convert-bzr.t] Error 1 Do you know of any change that could explain this? Thanks, Alex