Raspbian Package Auto-Building

Build log for mercurial (6.8-3) on armhf

mercurial6.8-3armhf → 2024-07-25 08:36:53

sbuild (Debian sbuild) 0.85.0 (04 January 2023) on test2023

+==============================================================================+
| mercurial 6.8-3 (armhf)                      Thu, 25 Jul 2024 06:02:54 +0000 |
+==============================================================================+

Package: mercurial
Version: 6.8-3
Source Version: 6.8-3
Distribution: trixie-staging
Machine Architecture: arm64
Host Architecture: armhf
Build Architecture: armhf
Build Type: any

I: NOTICE: Log filtering will replace 'var/run/schroot/mount/trixie-staging-armhf-sbuild-c763ec0f-3c37-4005-8544-ef47a370ed64' with '<<CHROOT>>'
I: NOTICE: Log filtering will replace 'build/mercurial-KK62oP/resolver-f1QNGd' with '<<RESOLVERDIR>>'

+------------------------------------------------------------------------------+
| Update chroot                                                                |
+------------------------------------------------------------------------------+

Get:1 http://172.17.4.1/private trixie-staging InRelease [11.3 kB]
Get:2 http://172.17.4.1/private trixie-staging/main Sources [14.6 MB]
Get:3 http://172.17.4.1/private trixie-staging/main armhf Packages [15.1 MB]
Fetched 29.7 MB in 5s (5680 kB/s)
Reading package lists...
W: http://172.17.4.1/private/dists/trixie-staging/InRelease: Key is stored in legacy trusted.gpg keyring (/etc/apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details.

+------------------------------------------------------------------------------+
| Fetch source files                                                           |
+------------------------------------------------------------------------------+


Check APT
---------

Checking available source versions...

Download source files with APT
------------------------------

Reading package lists...
NOTICE: 'mercurial' packaging is maintained in the 'Git' version control system at:
https://salsa.debian.org/python-team/packages/mercurial.git
Please use:
git clone https://salsa.debian.org/python-team/packages/mercurial.git
to retrieve the latest (possibly unreleased) updates to the package.
Need to get 8380 kB of source archives.
Get:1 http://172.17.4.1/private trixie-staging/main mercurial 6.8-3 (dsc) [2786 B]
Get:2 http://172.17.4.1/private trixie-staging/main mercurial 6.8-3 (tar) [8322 kB]
Get:3 http://172.17.4.1/private trixie-staging/main mercurial 6.8-3 (asc) [659 B]
Get:4 http://172.17.4.1/private trixie-staging/main mercurial 6.8-3 (diff) [55.0 kB]
Fetched 8380 kB in 1s (8283 kB/s)
Download complete and in download only mode
I: NOTICE: Log filtering will replace 'build/mercurial-KK62oP/mercurial-6.8' with '<<PKGBUILDDIR>>'
I: NOTICE: Log filtering will replace 'build/mercurial-KK62oP' with '<<BUILDDIR>>'

+------------------------------------------------------------------------------+
| Install package build dependencies                                           |
+------------------------------------------------------------------------------+


Setup apt archive
-----------------

Merged Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, gettext, netbase, patchutils (>= 0.2.25), python3-all-dev, python3-docutils, python3-roman, python3-packaging, rename, unzip, zip, less, build-essential, fakeroot
Filtered Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, gettext, netbase, patchutils (>= 0.2.25), python3-all-dev, python3-docutils, python3-roman, python3-packaging, rename, unzip, zip, less, build-essential, fakeroot
dpkg-deb: building package 'sbuild-build-depends-main-dummy' in '/<<RESOLVERDIR>>/apt_archive/sbuild-build-depends-main-dummy.deb'.
Ign:1 copy:/<<RESOLVERDIR>>/apt_archive ./ InRelease
Get:2 copy:/<<RESOLVERDIR>>/apt_archive ./ Release [609 B]
Ign:3 copy:/<<RESOLVERDIR>>/apt_archive ./ Release.gpg
Get:4 copy:/<<RESOLVERDIR>>/apt_archive ./ Sources [859 B]
Get:5 copy:/<<RESOLVERDIR>>/apt_archive ./ Packages [814 B]
Fetched 2282 B in 0s (0 B/s)
Reading package lists...
Reading package lists...

Install main build dependencies (apt-based resolver)
----------------------------------------------------

Installing build dependencies
Reading package lists...
Building dependency tree...
Reading state information...
The following packages were automatically installed and are no longer required:
  ca-certificates cron cron-daemon-common dbus dbus-bin dbus-daemon
  dbus-session-bus-common dbus-system-bus-common dmsetup
  libalgorithm-diff-perl libalgorithm-merge-perl libapparmor1
  libarchive-cpio-perl libcryptsetup12 libdbus-1-3 libdevmapper1.02.1
  libfdisk1 libfile-fcntllock-perl libjson-c5 libkmod2 libltdl-dev libltdl7
  libmail-sendmail-perl libsys-hostname-long-perl libsystemd-shared openssl
  systemd systemd-dev systemd-timesyncd
Use 'apt autoremove' to remove them.
The following additional packages will be installed:
  bash-completion dh-python docutils-common less libexpat1-dev libjs-jquery
  libjs-sphinxdoc libjs-underscore libpython3-all-dev libpython3-dev
  libpython3-stdlib libpython3.12-dev libpython3.12-minimal
  libpython3.12-stdlib libpython3.12t64 media-types patchutils python3
  python3-all python3-all-dev python3-dev python3-docutils python3-minimal
  python3-packaging python3-pkg-resources python3-roman python3-setuptools
  python3.12 python3.12-dev python3.12-minimal rename sgml-base unzip xml-core
  zip zlib1g-dev
Suggested packages:
  flit python3-build python3-installer python3-wheel python3-doc python3-tk
  python3-venv docutils-doc fonts-linuxlibertine | ttf-linux-libertine
  texlive-lang-french texlive-latex-base texlive-latex-recommended
  python-setuptools-doc python3.12-venv python3.12-doc binfmt-support
  sgml-base-doc
Recommended packages:
  javascript-common libpaper-utils python3-pil python3-pygments
The following NEW packages will be installed:
  bash-completion dh-python docutils-common less libexpat1-dev libjs-jquery
  libjs-sphinxdoc libjs-underscore libpython3-all-dev libpython3-dev
  libpython3-stdlib libpython3.12-dev libpython3.12-minimal
  libpython3.12-stdlib libpython3.12t64 media-types patchutils python3
  python3-all python3-all-dev python3-dev python3-docutils python3-minimal
  python3-packaging python3-pkg-resources python3-roman python3-setuptools
  python3.12 python3.12-dev python3.12-minimal rename
  sbuild-build-depends-main-dummy sgml-base unzip xml-core zip zlib1g-dev
0 upgraded, 37 newly installed, 0 to remove and 0 not upgraded.
Need to get 15.6 MB of archives.
After this operation, 62.0 MB of additional disk space will be used.
Get:1 copy:/<<RESOLVERDIR>>/apt_archive ./ sbuild-build-depends-main-dummy 0.invalid.0 [964 B]
Get:2 http://172.17.4.1/private trixie-staging/main armhf libpython3.12-minimal armhf 3.12.4-3 [796 kB]
Get:3 http://172.17.4.1/private trixie-staging/main armhf python3.12-minimal armhf 3.12.4-3 [1756 kB]
Get:4 http://172.17.4.1/private trixie-staging/main armhf python3-minimal armhf 3.12.3-1 [26.5 kB]
Get:5 http://172.17.4.1/private trixie-staging/main armhf media-types all 10.1.0 [26.9 kB]
Get:6 http://172.17.4.1/private trixie-staging/main armhf libpython3.12-stdlib armhf 3.12.4-3 [1795 kB]
Get:7 http://172.17.4.1/private trixie-staging/main armhf python3.12 armhf 3.12.4-3 [664 kB]
Get:8 http://172.17.4.1/private trixie-staging/main armhf libpython3-stdlib armhf 3.12.3-1 [9472 B]
Get:9 http://172.17.4.1/private trixie-staging/main armhf python3 armhf 3.12.3-1 [27.5 kB]
Get:10 http://172.17.4.1/private trixie-staging/main armhf sgml-base all 1.31 [15.4 kB]
Get:11 http://172.17.4.1/private trixie-staging/main armhf less armhf 643-1 [128 kB]
Get:12 http://172.17.4.1/private trixie-staging/main armhf bash-completion all 1:2.14.0-1 [305 kB]
Get:13 http://172.17.4.1/private trixie-staging/main armhf python3-pkg-resources all 68.1.2-4 [241 kB]
Get:14 http://172.17.4.1/private trixie-staging/main armhf python3-setuptools all 68.1.2-4 [468 kB]
Get:15 http://172.17.4.1/private trixie-staging/main armhf dh-python all 6.20240603 [109 kB]
Get:16 http://172.17.4.1/private trixie-staging/main armhf xml-core all 0.19 [20.1 kB]
Get:17 http://172.17.4.1/private trixie-staging/main armhf docutils-common all 0.20.1+dfsg-3 [128 kB]
Get:18 http://172.17.4.1/private trixie-staging/main armhf libexpat1-dev armhf 2.6.2-1 [136 kB]
Get:19 http://172.17.4.1/private trixie-staging/main armhf libjs-jquery all 3.6.1+dfsg+~3.5.14-1 [326 kB]
Get:20 http://172.17.4.1/private trixie-staging/main armhf libjs-underscore all 1.13.4~dfsg+~1.11.4-3 [116 kB]
Get:21 http://172.17.4.1/private trixie-staging/main armhf libjs-sphinxdoc all 7.3.7-3 [154 kB]
Get:22 http://172.17.4.1/private trixie-staging/main armhf libpython3.12t64 armhf 3.12.4-3 [1772 kB]
Get:23 http://172.17.4.1/private trixie-staging/main armhf zlib1g-dev armhf 1:1.3.dfsg+really1.3.1-1 [903 kB]
Get:24 http://172.17.4.1/private trixie-staging/main armhf libpython3.12-dev armhf 3.12.4-3 [4217 kB]
Get:25 http://172.17.4.1/private trixie-staging/main armhf libpython3-dev armhf 3.12.3-1 [9712 B]
Get:26 http://172.17.4.1/private trixie-staging/main armhf libpython3-all-dev armhf 3.12.3-1 [1068 B]
Get:27 http://172.17.4.1/private trixie-staging/main armhf patchutils armhf 0.4.2-1 [68.7 kB]
Get:28 http://172.17.4.1/private trixie-staging/main armhf python3-all armhf 3.12.3-1 [1040 B]
Get:29 http://172.17.4.1/private trixie-staging/main armhf python3.12-dev armhf 3.12.4-3 [499 kB]
Get:30 http://172.17.4.1/private trixie-staging/main armhf python3-dev armhf 3.12.3-1 [26.2 kB]
Get:31 http://172.17.4.1/private trixie-staging/main armhf python3-all-dev armhf 3.12.3-1 [1068 B]
Get:32 http://172.17.4.1/private trixie-staging/main armhf python3-roman all 3.3-3 [9880 B]
Get:33 http://172.17.4.1/private trixie-staging/main armhf python3-docutils all 0.20.1+dfsg-3 [389 kB]
Get:34 http://172.17.4.1/private trixie-staging/main armhf python3-packaging all 24.1-1 [45.8 kB]
Get:35 http://172.17.4.1/private trixie-staging/main armhf rename all 2.02-1 [21.8 kB]
Get:36 http://172.17.4.1/private trixie-staging/main armhf unzip armhf 6.0-28 [147 kB]
Get:37 http://172.17.4.1/private trixie-staging/main armhf zip armhf 3.0-13 [207 kB]
debconf: delaying package configuration, since apt-utils is not installed
Fetched 15.6 MB in 2s (8618 kB/s)
Selecting previously unselected package libpython3.12-minimal:armhf.
(Reading database ... 16263 files and directories currently installed.)
Preparing to unpack .../libpython3.12-minimal_3.12.4-3_armhf.deb ...
Unpacking libpython3.12-minimal:armhf (3.12.4-3) ...
Selecting previously unselected package python3.12-minimal.
Preparing to unpack .../python3.12-minimal_3.12.4-3_armhf.deb ...
Unpacking python3.12-minimal (3.12.4-3) ...
Setting up libpython3.12-minimal:armhf (3.12.4-3) ...
Setting up python3.12-minimal (3.12.4-3) ...
Selecting previously unselected package python3-minimal.
(Reading database ... 16573 files and directories currently installed.)
Preparing to unpack .../python3-minimal_3.12.3-1_armhf.deb ...
Unpacking python3-minimal (3.12.3-1) ...
Selecting previously unselected package media-types.
Preparing to unpack .../media-types_10.1.0_all.deb ...
Unpacking media-types (10.1.0) ...
Selecting previously unselected package libpython3.12-stdlib:armhf.
Preparing to unpack .../libpython3.12-stdlib_3.12.4-3_armhf.deb ...
Unpacking libpython3.12-stdlib:armhf (3.12.4-3) ...
Selecting previously unselected package python3.12.
Preparing to unpack .../python3.12_3.12.4-3_armhf.deb ...
Unpacking python3.12 (3.12.4-3) ...
Selecting previously unselected package libpython3-stdlib:armhf.
Preparing to unpack .../libpython3-stdlib_3.12.3-1_armhf.deb ...
Unpacking libpython3-stdlib:armhf (3.12.3-1) ...
Setting up python3-minimal (3.12.3-1) ...
Selecting previously unselected package python3.
(Reading database ... 17008 files and directories currently installed.)
Preparing to unpack .../00-python3_3.12.3-1_armhf.deb ...
Unpacking python3 (3.12.3-1) ...
Selecting previously unselected package sgml-base.
Preparing to unpack .../01-sgml-base_1.31_all.deb ...
Unpacking sgml-base (1.31) ...
Selecting previously unselected package less.
Preparing to unpack .../02-less_643-1_armhf.deb ...
Unpacking less (643-1) ...
Selecting previously unselected package bash-completion.
Preparing to unpack .../03-bash-completion_1%3a2.14.0-1_all.deb ...
Unpacking bash-completion (1:2.14.0-1) ...
Selecting previously unselected package python3-pkg-resources.
Preparing to unpack .../04-python3-pkg-resources_68.1.2-4_all.deb ...
Unpacking python3-pkg-resources (68.1.2-4) ...
Selecting previously unselected package python3-setuptools.
Preparing to unpack .../05-python3-setuptools_68.1.2-4_all.deb ...
Unpacking python3-setuptools (68.1.2-4) ...
Selecting previously unselected package dh-python.
Preparing to unpack .../06-dh-python_6.20240603_all.deb ...
Unpacking dh-python (6.20240603) ...
Selecting previously unselected package xml-core.
Preparing to unpack .../07-xml-core_0.19_all.deb ...
Unpacking xml-core (0.19) ...
Selecting previously unselected package docutils-common.
Preparing to unpack .../08-docutils-common_0.20.1+dfsg-3_all.deb ...
Unpacking docutils-common (0.20.1+dfsg-3) ...
Selecting previously unselected package libexpat1-dev:armhf.
Preparing to unpack .../09-libexpat1-dev_2.6.2-1_armhf.deb ...
Unpacking libexpat1-dev:armhf (2.6.2-1) ...
Selecting previously unselected package libjs-jquery.
Preparing to unpack .../10-libjs-jquery_3.6.1+dfsg+~3.5.14-1_all.deb ...
Unpacking libjs-jquery (3.6.1+dfsg+~3.5.14-1) ...
Selecting previously unselected package libjs-underscore.
Preparing to unpack .../11-libjs-underscore_1.13.4~dfsg+~1.11.4-3_all.deb ...
Unpacking libjs-underscore (1.13.4~dfsg+~1.11.4-3) ...
Selecting previously unselected package libjs-sphinxdoc.
Preparing to unpack .../12-libjs-sphinxdoc_7.3.7-3_all.deb ...
Unpacking libjs-sphinxdoc (7.3.7-3) ...
Selecting previously unselected package libpython3.12t64:armhf.
Preparing to unpack .../13-libpython3.12t64_3.12.4-3_armhf.deb ...
Unpacking libpython3.12t64:armhf (3.12.4-3) ...
Selecting previously unselected package zlib1g-dev:armhf.
Preparing to unpack .../14-zlib1g-dev_1%3a1.3.dfsg+really1.3.1-1_armhf.deb ...
Unpacking zlib1g-dev:armhf (1:1.3.dfsg+really1.3.1-1) ...
Selecting previously unselected package libpython3.12-dev:armhf.
Preparing to unpack .../15-libpython3.12-dev_3.12.4-3_armhf.deb ...
Unpacking libpython3.12-dev:armhf (3.12.4-3) ...
Selecting previously unselected package libpython3-dev:armhf.
Preparing to unpack .../16-libpython3-dev_3.12.3-1_armhf.deb ...
Unpacking libpython3-dev:armhf (3.12.3-1) ...
Selecting previously unselected package libpython3-all-dev:armhf.
Preparing to unpack .../17-libpython3-all-dev_3.12.3-1_armhf.deb ...
Unpacking libpython3-all-dev:armhf (3.12.3-1) ...
Selecting previously unselected package patchutils.
Preparing to unpack .../18-patchutils_0.4.2-1_armhf.deb ...
Unpacking patchutils (0.4.2-1) ...
Selecting previously unselected package python3-all.
Preparing to unpack .../19-python3-all_3.12.3-1_armhf.deb ...
Unpacking python3-all (3.12.3-1) ...
Selecting previously unselected package python3.12-dev.
Preparing to unpack .../20-python3.12-dev_3.12.4-3_armhf.deb ...
Unpacking python3.12-dev (3.12.4-3) ...
Selecting previously unselected package python3-dev.
Preparing to unpack .../21-python3-dev_3.12.3-1_armhf.deb ...
Unpacking python3-dev (3.12.3-1) ...
Selecting previously unselected package python3-all-dev.
Preparing to unpack .../22-python3-all-dev_3.12.3-1_armhf.deb ...
Unpacking python3-all-dev (3.12.3-1) ...
Selecting previously unselected package python3-roman.
Preparing to unpack .../23-python3-roman_3.3-3_all.deb ...
Unpacking python3-roman (3.3-3) ...
Selecting previously unselected package python3-docutils.
Preparing to unpack .../24-python3-docutils_0.20.1+dfsg-3_all.deb ...
Unpacking python3-docutils (0.20.1+dfsg-3) ...
Selecting previously unselected package python3-packaging.
Preparing to unpack .../25-python3-packaging_24.1-1_all.deb ...
Unpacking python3-packaging (24.1-1) ...
Selecting previously unselected package rename.
Preparing to unpack .../26-rename_2.02-1_all.deb ...
Unpacking rename (2.02-1) ...
Selecting previously unselected package unzip.
Preparing to unpack .../27-unzip_6.0-28_armhf.deb ...
Unpacking unzip (6.0-28) ...
Selecting previously unselected package zip.
Preparing to unpack .../28-zip_3.0-13_armhf.deb ...
Unpacking zip (3.0-13) ...
Selecting previously unselected package sbuild-build-depends-main-dummy.
Preparing to unpack .../29-sbuild-build-depends-main-dummy_0.invalid.0_armhf.deb ...
Unpacking sbuild-build-depends-main-dummy (0.invalid.0) ...
Setting up media-types (10.1.0) ...
Setting up libpython3.12-stdlib:armhf (3.12.4-3) ...
Setting up unzip (6.0-28) ...
Setting up python3.12 (3.12.4-3) ...
Setting up less (643-1) ...
Setting up rename (2.02-1) ...
update-alternatives: using /usr/bin/file-rename to provide /usr/bin/rename (rename) in auto mode
Setting up libpython3.12t64:armhf (3.12.4-3) ...
Setting up patchutils (0.4.2-1) ...
Setting up zip (3.0-13) ...
Setting up libexpat1-dev:armhf (2.6.2-1) ...
Setting up bash-completion (1:2.14.0-1) ...
Setting up zlib1g-dev:armhf (1:1.3.dfsg+really1.3.1-1) ...
Setting up sgml-base (1.31) ...
Setting up libjs-jquery (3.6.1+dfsg+~3.5.14-1) ...
Setting up libpython3-stdlib:armhf (3.12.3-1) ...
Setting up libjs-underscore (1.13.4~dfsg+~1.11.4-3) ...
Setting up python3 (3.12.3-1) ...
Setting up libpython3.12-dev:armhf (3.12.4-3) ...
Setting up python3-roman (3.3-3) ...
Setting up python3-packaging (24.1-1) ...
Setting up python3.12-dev (3.12.4-3) ...
Setting up libjs-sphinxdoc (7.3.7-3) ...
Setting up xml-core (0.19) ...
Setting up python3-pkg-resources (68.1.2-4) ...
Setting up libpython3-dev:armhf (3.12.3-1) ...
Setting up python3-setuptools (68.1.2-4) ...
Setting up python3-all (3.12.3-1) ...
Setting up libpython3-all-dev:armhf (3.12.3-1) ...
Setting up python3-dev (3.12.3-1) ...
Setting up dh-python (6.20240603) ...
Setting up python3-all-dev (3.12.3-1) ...
Processing triggers for libc-bin (2.38-13+rpi1) ...
Processing triggers for systemd (255.3-1+rpi1+b1) ...
Processing triggers for man-db (2.12.1-2) ...
Not building database; man-db/auto-update is not 'true'.
Processing triggers for sgml-base (1.31) ...
Setting up docutils-common (0.20.1+dfsg-3) ...
Processing triggers for sgml-base (1.31) ...
Setting up python3-docutils (0.20.1+dfsg-3) ...
Setting up sbuild-build-depends-main-dummy (0.invalid.0) ...

+------------------------------------------------------------------------------+
| Check architectures                                                          |
+------------------------------------------------------------------------------+

Arch check ok (armhf included in any all)

+------------------------------------------------------------------------------+
| Build environment                                                            |
+------------------------------------------------------------------------------+

Kernel: Linux 6.1.47-v8+ #1 SMP PREEMPT Fri Sep  1 07:05:33 BST 2023 arm64 (aarch64)
Toolchain package versions: binutils_2.41-6+rpi1+b1 dpkg-dev_1.22.6+rpi1 g++-12_12.4.0-1+rpi1 g++-13_13.3.0-1+rpi1 gcc-12_12.4.0-1+rpi1 gcc-13_13.3.0-1+rpi1 libc6-dev_2.38-13+rpi1 libstdc++-12-dev_12.4.0-1+rpi1 libstdc++-13-dev_13.3.0-1+rpi1 libstdc++6_14-20240221-2.1+rpi1 linux-libc-dev_6.5.6-1+rpi1+b3
Package versions: adduser_3.137 apt_2.9.6 autoconf_2.71-3 automake_1:1.16.5-1.3 autopoint_0.22.5-1 autotools-dev_20220109.1 base-files_13.3+rpi1 base-passwd_3.6.4 bash_5.2.21-2.1 bash-completion_1:2.14.0-1 binutils_2.41-6+rpi1+b1 binutils-arm-linux-gnueabihf_2.41-6+rpi1+b1 binutils-common_2.41-6+rpi1+b1 bsdextrautils_2.40.2-1 bsdutils_1:2.40.2-1 build-essential_12.10 bzip2_1.0.8-5.1 ca-certificates_20240203 coreutils_9.4-3.1 cpp_4:13.2.0-1+rpi1 cpp-12_12.4.0-1+rpi1 cpp-13_13.3.0-1+rpi1 cpp-13-arm-linux-gnueabihf_13.3.0-1+rpi1 cron_3.0pl1-189 cron-daemon-common_3.0pl1-189 dash_0.5.12-9 dbus_1.14.10-4+b1 dbus-bin_1.14.10-4+b1 dbus-daemon_1.14.10-4+b1 dbus-session-bus-common_1.14.10-4 dbus-system-bus-common_1.14.10-4 debconf_1.5.87 debhelper_13.16 debianutils_5.20 dh-autoreconf_20 dh-python_6.20240603 dh-strip-nondeterminism_1.14.0-1 diffutils_1:3.10-1 dirmngr_2.2.43-7 dmsetup_2:1.02.196-1+b1 docutils-common_0.20.1+dfsg-3 dpkg_1.22.6+rpi1 dpkg-dev_1.22.6+rpi1 dwz_0.15-1+b2 e2fsprogs_1.47.1-1 fakeroot_1.33-1 file_1:5.45-3 findutils_4.10.0-2 g++_4:13.2.0-1+rpi1 g++-12_12.4.0-1+rpi1 g++-13_13.3.0-1+rpi1 g++-13-arm-linux-gnueabihf_13.3.0-1+rpi1 gcc_4:13.2.0-1+rpi1 gcc-10-base_10.4.0-7+rpi1 gcc-12_12.4.0-1+rpi1 gcc-12-base_12.4.0-1+rpi1 gcc-13_13.3.0-1+rpi1 gcc-13-arm-linux-gnueabihf_13.3.0-1+rpi1 gcc-13-base_13.3.0-1+rpi1 gcc-14-base_14-20240221-2.1+rpi1 gcc-7-base_7.5.0-6+rpi1+b2 gcc-8-base_8.4.0-7+rpi1 gcc-9-base_9.4.0-2+rpi1+b1 gettext_0.22.5-1 gettext-base_0.22.5-1 gnupg_2.2.43-7 gnupg-l10n_2.2.43-7 gnupg-utils_2.2.43-7 gpg_2.2.43-7 gpg-agent_2.2.43-7 gpg-wks-client_2.2.43-7 gpgconf_2.2.43-7 gpgsm_2.2.43-7 gpgv_2.2.43-7 grep_3.11-4 groff-base_1.23.0-5 gzip_1.12-1.1 hostname_3.23+nmu2 init-system-helpers_1.66 intltool-debian_0.35.0+20060710.6 less_643-1 libacl1_2.3.2-2+rpi1 libalgorithm-diff-perl_1.201-1 libalgorithm-merge-perl_0.08-5 libapparmor1_3.1.7-1 libapt-pkg6.0t64_2.9.6 libarchive-cpio-perl_0.10-3 libarchive-zip-perl_1.68-1 libasan8_14-20240221-2.1+rpi1 libassuan0_2.5.6-1 libatomic1_14-20240221-2.1+rpi1 libattr1_1:2.5.2-1 libaudit-common_1:3.1.2-4 libaudit1_1:3.1.2-4 libbinutils_2.41-6+rpi1+b1 libblkid1_2.40.2-1 libbsd0_0.12.2-1 libbz2-1.0_1.0.8-5.1 libc-bin_2.38-13+rpi1 libc-dev-bin_2.38-13+rpi1 libc6_2.38-13+rpi1 libc6-dev_2.38-13+rpi1 libcap-ng0_0.8.5-1 libcap2_1:2.66-5 libcc1-0_14-20240221-2.1+rpi1 libcom-err2_1.47.1-1 libcrypt-dev_1:4.4.36-4 libcrypt1_1:4.4.36-4 libcryptsetup12_2:2.7.2-2+rpi1 libctf-nobfd0_2.41-6+rpi1+b1 libctf0_2.41-6+rpi1+b1 libdb5.3t64_5.3.28+dfsg2-7 libdbus-1-3_1.14.10-4+b1 libdebconfclient0_0.272 libdebhelper-perl_13.16 libdevmapper1.02.1_2:1.02.196-1+b1 libdpkg-perl_1.22.6+rpi1 libelf1t64_0.191-1+rpi1 libexpat1_2.6.2-1 libexpat1-dev_2.6.2-1 libext2fs2t64_1.47.1-1 libfakeroot_1.33-1 libfdisk1_2.40.2-1 libffi8_3.4.6-1 libfile-fcntllock-perl_0.22-4+b3 libfile-stripnondeterminism-perl_1.14.0-1 libgcc-12-dev_12.4.0-1+rpi1 libgcc-13-dev_13.3.0-1+rpi1 libgcc-s1_14-20240221-2.1+rpi1 libgcrypt20_1.11.0-2 libgdbm-compat4t64_1.23-6 libgdbm6t64_1.23-6 libgmp10_2:6.3.0+dfsg-2 libgnutls30t64_3.8.6-2 libgomp1_14-20240221-2.1+rpi1 libgpg-error0_1.49-2 libhogweed6t64_3.10-1 libicu72_72.1-5 libidn2-0_2.3.7-2 libisl23_0.26-3 libjansson4_2.14-2 libjs-jquery_3.6.1+dfsg+~3.5.14-1 libjs-sphinxdoc_7.3.7-3 libjs-underscore_1.13.4~dfsg+~1.11.4-3 libjson-c5_0.17-1 libk5crypto3_1.21.2-1 libkeyutils1_1.6.3-3 libkmod2_31+20240202-2+rpi1 libkrb5support0_1.21.2-1 libksba8_1.6.7-2 libldap-2.5-0_2.5.18+dfsg-2 libltdl-dev_2.4.7-7+b1 libltdl7_2.4.7-7+b1 liblz4-1_1.9.4-2+rpi1 liblzma5_5.6.2-2 libmagic-mgc_1:5.45-3 libmagic1t64_1:5.45-3 libmail-sendmail-perl_0.80-3 libmd0_1.1.0-2 libmount1_2.40.2-1 libmpc3_1.3.1-1 libmpfr6_4.2.1-1 libncursesw6_6.5-2 libnettle8t64_3.10-1 libnpth0t64_1.6-3.1 libp11-kit0_0.25.5-2 libpam-modules_1.5.3-7 libpam-modules-bin_1.5.3-7 libpam-runtime_1.5.3-7 libpam0g_1.5.3-7 libpcre2-8-0_10.42-4+b1 libperl5.38t64_5.38.2-5 libpipeline1_1.5.7-2 libpython3-all-dev_3.12.3-1 libpython3-dev_3.12.3-1 libpython3-stdlib_3.12.3-1 libpython3.12-dev_3.12.4-3 libpython3.12-minimal_3.12.4-3 libpython3.12-stdlib_3.12.4-3 libpython3.12t64_3.12.4-3 libreadline8t64_8.2-4 libsasl2-2_2.1.28+dfsg1-6 libsasl2-modules-db_2.1.28+dfsg1-6 libseccomp2_2.5.5-1+rpi1+b1 libselinux1_3.5-2+b2 libsemanage-common_3.5-1 libsemanage2_3.5-1+b1 libsepol2_3.5-2+b1 libsframe1_2.41-6+rpi1+b1 libsmartcols1_2.40.2-1 libsqlite3-0_3.46.0-1 libss2_1.47.1-1 libssl3t64_3.2.2-1 libstdc++-12-dev_12.4.0-1+rpi1 libstdc++-13-dev_13.3.0-1+rpi1 libstdc++6_14-20240221-2.1+rpi1 libsys-hostname-long-perl_1.5-3 libsystemd-shared_255.3-1+rpi1+b1 libsystemd0_255.3-1+rpi1+b1 libtasn1-6_4.19.0-3+b2 libtinfo6_6.5-2 libtirpc-common_1.3.4+ds-1.3 libtool_2.4.7-7 libubsan1_14-20240221-2.1+rpi1 libuchardet0_0.0.8-1 libudev1_255.3-1+rpi1+b1 libunistring5_1.2-1 libuuid1_2.40.2-1 libxml2_2.9.14+dfsg-1.3+b4 libxxhash0_0.8.2-2+b1 libzstd1_1.5.6+dfsg-1 linux-libc-dev_6.5.6-1+rpi1+b3 login_1:4.15.3-2 logsave_1.47.1-1 lsb-base_11.6+rpi1 m4_1.4.19-4 make_4.3-4.1 man-db_2.12.1-2 mawk_1.3.4.20240622-2 media-types_10.1.0 mount_2.40.2-1 nano_8.1-1 ncurses-base_6.5-2 ncurses-bin_6.5-2 netbase_6.4 openssl_3.2.2-1 passwd_1:4.15.3-2 patch_2.7.6-7 patchutils_0.4.2-1 perl_5.38.2-5 perl-base_5.38.2-5 perl-modules-5.38_5.38.2-5 pinentry-curses_1.2.1-3+b1 po-debconf_1.0.21+nmu1 python3_3.12.3-1 python3-all_3.12.3-1 python3-all-dev_3.12.3-1 python3-dev_3.12.3-1 python3-docutils_0.20.1+dfsg-3 python3-minimal_3.12.3-1 python3-packaging_24.1-1 python3-pkg-resources_68.1.2-4 python3-roman_3.3-3 python3-setuptools_68.1.2-4 python3.12_3.12.4-3 python3.12-dev_3.12.4-3 python3.12-minimal_3.12.4-3 raspbian-archive-keyring_20120528.2 readline-common_8.2-4 rename_2.02-1 rpcsvc-proto_1.4.3-1 sbuild-build-depends-main-dummy_0.invalid.0 sed_4.9-2 sensible-utils_0.0.24 sgml-base_1.31 systemd_255.3-1+rpi1+b1 systemd-dev_255.3-1+rpi1 systemd-timesyncd_255.3-1+rpi1+b1 sysvinit-utils_3.09-2 tar_1.35+dfsg-3 tzdata_2024a-4 unzip_6.0-28 usr-is-merged_39 util-linux_2.40.2-1 xml-core_0.19 xz-utils_5.6.2-2 zip_3.0-13 zlib1g_1:1.3.dfsg+really1.3.1-1 zlib1g-dev_1:1.3.dfsg+really1.3.1-1

+------------------------------------------------------------------------------+
| Build                                                                        |
+------------------------------------------------------------------------------+


Unpack source
-------------

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 3.0 (quilt)
Source: mercurial
Binary: mercurial-common, mercurial
Architecture: any all
Version: 6.8-3
Maintainer: Debian Python Team <team+python@tracker.debian.org>
Uploaders:  Julien Cristau <jcristau@debian.org>,
Homepage: https://www.mercurial-scm.org/
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/python-team/packages/mercurial
Vcs-Git: https://salsa.debian.org/python-team/packages/mercurial.git
Testsuite: autopkgtest
Testsuite-Triggers: bzr, clang-format, cvs, darcs, gcc, gettext, git, less, netbase, pylint, python3-dev, python3-docutils, python3-fuzzywuzzy, python3-packaging, python3-pygit2, python3-pygments, python3-subversion, python3-vcr, sqlite3, subversion, tla, unzip, zip
Build-Depends: bash-completion, debhelper-compat (= 13), dh-python, gettext, netbase <!nocheck>, patchutils (>= 0.2.25) <!nocheck>, python3-all-dev, python3-docutils, python3-roman, python3-packaging <!nocheck>, rename <!nocheck>, unzip <!nocheck>, zip <!nocheck>, less <!nocheck>
Package-List:
 mercurial deb vcs optional arch=any
 mercurial-common deb vcs optional arch=all
Checksums-Sha1:
 6aa5cac62ddabceb5cb704f15ac42ffd5a364799 8322075 mercurial_6.8.orig.tar.gz
 121225b53f638def909c2c1202d01185c3a3e218 659 mercurial_6.8.orig.tar.gz.asc
 1dc8add9cb35bee2f74f749e978b1e4ef33b7e9c 54960 mercurial_6.8-3.debian.tar.xz
Checksums-Sha256:
 08e4d0e5da8af1132b51e6bc3350180ad57adcd935f097b6d0bc119a2c2c0a10 8322075 mercurial_6.8.orig.tar.gz
 7cda2cb212a21ad66713ac7699442d542add753959059cd4acec33c761d10181 659 mercurial_6.8.orig.tar.gz.asc
 483041fa1b832b20a941abe6b6b593126921b64ccc17b0312b8693bcf448cfe9 54960 mercurial_6.8-3.debian.tar.xz
Files:
 4826ab69616e1d647b2ca9eb28bf9ade 8322075 mercurial_6.8.orig.tar.gz
 5d31ca5d44ed0196ff31fb8b923ac9aa 659 mercurial_6.8.orig.tar.gz.asc
 ad7ad3798ce967cc641c2a886233bf1e 54960 mercurial_6.8-3.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQJIBAEBCgAyFiEEVXgdqzTmGgnvuIvhnbAjVVb4z60FAmaetmsUHGpjcmlzdGF1
QGRlYmlhbi5vcmcACgkQnbAjVVb4z63v4g/+LozHsspn/iPB8vKwc+HnTX3Acb4Z
Yb6C1XYmmJB1KnpO0RcdU/dY47CGSRyRsjG0kLR3YU243TO1l2SKBRH8J3HZ5P69
85Av75YEB/5MAeTnw6rss9bQjoHX3tBnspnUsGCF7pm+S3rsPVlcpS2MxGHlGlnr
FZR984Lx5PgyDkh9moDOfyVNj68qSNXm4Wv9LbRJR0macNSL3dzntbZCJB4lcoS2
RPYSPhrkEWzDSanfzXd1clYtY/gKMRFaa1slWg9AVvMdkIN69tCpHsDv6UZPnNcE
WPSs3nldbJIqRy3O+X+pEKlLvf9zHFoQJsv7j7ScN/0Za/JpEvD1RWNK8hycdQr6
TnWikC1lUc+Q9/UfRmbuB/2mqWeMBy9fj8FvEiLINL155VYF1p6PtrRERRmFnKWQ
gmM94QWrGAx8FSkvmhwA34jLIc+uaGkEKNMns3vWVe7+jr77NlO3+iSg9FalUzNx
Yk7cd8J1PC6ZIbdMSUXHJruqEUCLLmoCZ7ZhKj85M0pyTvRkprOMi0o4sViK20Sw
hXKF7eKU4umXm79K+dr43O8m8kWgvFj93qPXQHB1EJXen8jKVd+GXvRj+kmAGqDM
AKnzqXTK3MSU1+Ak/V6zONhC7TWXZESUBEgpMKDByRM5LnMWTBAvG9DJT+1KApT9
ixtMyYOXi5vlHEU=
=Q5r2
-----END PGP SIGNATURE-----

gpgv: Signature made Mon Jul 22 19:43:39 2024 UTC
gpgv:                using RSA key 55781DAB34E61A09EFB88BE19DB0235556F8CFAD
gpgv:                issuer "jcristau@debian.org"
gpgv: Can't check signature: No public key
dpkg-source: warning: cannot verify inline signature for ./mercurial_6.8-3.dsc: no acceptable signature found
dpkg-source: info: extracting mercurial in /<<PKGBUILDDIR>>
dpkg-source: info: unpacking mercurial_6.8.orig.tar.gz
dpkg-source: info: unpacking mercurial_6.8-3.debian.tar.xz
dpkg-source: info: using patch list from debian/patches/series
dpkg-source: info: applying demandimport-threading.patch
dpkg-source: info: applying proposed_upstream__doctest.path
dpkg-source: info: applying deb_specific__hgk.py.patch
dpkg-source: info: applying deb_specific__optional-dependencies
dpkg-source: info: applying deb_specific__disable_libdir_replacement.patch
dpkg-source: info: applying 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch
dpkg-source: info: applying test-hghave-testrepo.patch
dpkg-source: info: applying test_copies_chain_merge_slow.patch
dpkg-source: info: applying test_profiling_lsprof.patch
dpkg-source: info: applying test_lfs_serve_access.patch

Check disk space
----------------

Sufficient free space for build

User Environment
----------------

APT_CONFIG=/var/lib/sbuild/apt.conf
DEB_BUILD_OPTIONS=parallel=4
HOME=/sbuild-nonexistent
LANG=en_GB.UTF-8
LC_ALL=C.UTF-8
LOGNAME=buildd
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
SCHROOT_ALIAS_NAME=trixie-staging-armhf-sbuild
SCHROOT_CHROOT_NAME=trixie-staging-armhf-sbuild
SCHROOT_COMMAND=env
SCHROOT_GID=124
SCHROOT_GROUP=buildd
SCHROOT_SESSION_ID=trixie-staging-armhf-sbuild-c763ec0f-3c37-4005-8544-ef47a370ed64
SCHROOT_UID=114
SCHROOT_USER=buildd
SHELL=/bin/sh
USER=buildd

dpkg-buildpackage
-----------------

Command: dpkg-buildpackage --sanitize-env -us -uc -mRaspbian pi5 test autobuilder <root@raspbian.org> -B -rfakeroot
dpkg-buildpackage: info: source package mercurial
dpkg-buildpackage: info: source version 6.8-3
dpkg-buildpackage: info: source distribution unstable
 dpkg-source --before-build .
dpkg-buildpackage: info: host architecture armhf
 debian/rules clean
dh clean --with python3,bash-completion
   debian/rules override_dh_auto_clean
make[1]: Entering directory '/<<PKGBUILDDIR>>'
cp -a mercurial/__version__.py mercurial/__version__.py.save
dh_auto_clean -- PYTHON=python3
	make -j4 clean PYTHON=python3
make[2]: Entering directory '/<<PKGBUILDDIR>>'
rm -f hg.exe
python3 setup.py clean --all # ignore errors from this command
'build/lib.linux-aarch64-cpython-312' does not exist -- can't clean it
'build/bdist.linux-aarch64' does not exist -- can't clean it
'build/scripts-3.12' does not exist -- can't clean it
find contrib doc hgext hgext3rd i18n mercurial tests hgdemandimport \
	\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
rm -f mercurial/__modulepolicy__.py
if test -d .hg; then rm -f mercurial/__version__.py; fi
rm -rf build mercurial/locale
make -C doc clean
make[3]: Entering directory '/<<PKGBUILDDIR>>/doc'
rm -f hg-ssh.8 hg.1 hgignore.5 hgrc.5 hg-ssh.8.html hg.1.html hgignore.5.html hgrc.5.html common.txt hg-ssh.8.txt hg.1.txt hgignore.5.txt hgrc.5.txt hg-ssh.8.gendoc.txt hg.1.gendoc.txt hgignore.5.gendoc.txt hgrc.5.gendoc.txt MANIFEST
make[3]: Leaving directory '/<<PKGBUILDDIR>>/doc'
make -C contrib/chg distclean
make[3]: Entering directory '/<<PKGBUILDDIR>>/contrib/chg'
rm -f chg.o hgclient.o procutil.o util.o chg
make[3]: Leaving directory '/<<PKGBUILDDIR>>/contrib/chg'
rm -rf rust/target
rm -f mercurial/rustext.so
rm -rf packages
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
mv mercurial/__version__.py.save mercurial/__version__.py
rm -f -rv tmp/
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
   dh_clean
 debian/rules binary-arch
dh binary-arch --with python3,bash-completion
   dh_update_autotools_config -a
   dh_autoreconf -a
   dh_auto_configure -a
   debian/rules override_dh_auto_build
make[1]: Entering directory '/<<PKGBUILDDIR>>'
/usr/bin/make all PYTHON=python3.12
make[2]: Entering directory '/<<PKGBUILDDIR>>'
python3.12 setup.py  build 
1950 translated messages, 92 fuzzy translations, 1830 untranslated messages.
3185 translated messages, 102 fuzzy translations, 1301 untranslated messages.
i18n/el.po:7: warning: header field 'Language' missing in header
312 translated messages, 35 fuzzy translations, 1936 untranslated messages.
i18n/fr.po:86: warning: header field 'Language' missing in header
357 translated messages, 104 fuzzy translations, 1776 untranslated messages.
1872 translated messages, 3 fuzzy translations, 1233 untranslated messages.
5702 translated messages, 491 fuzzy translations, 864 untranslated messages.
6735 translated messages, 326 untranslated messages.
i18n/ro.po:106: warning: header field 'Language' missing in header
677 translated messages, 4 fuzzy translations, 2805 untranslated messages.
4668 translated messages, 10 untranslated messages.
2039 translated messages, 1 fuzzy translation, 2196 untranslated messages.
i18n/zh_CN.po:47: warning: header field 'Language' missing in header
336 translated messages, 203 fuzzy translations, 1792 untranslated messages.
640 translated messages, 8 fuzzy translations, 2372 untranslated messages.
mercurial/cext/bdiff.c: In function 'bdiff':
mercurial/cext/bdiff.c:96:16: warning: comparison of integer expressions of different signedness: 'Py_ssize_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
   96 |         if (la > UINT_MAX || lb > UINT_MAX) {
      |                ^
mercurial/cext/bdiff.c:96:33: warning: comparison of integer expressions of different signedness: 'Py_ssize_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
   96 |         if (la > UINT_MAX || lb > UINT_MAX) {
      |                                 ^
mercurial/cext/osutil.c: In function 'describefstype':
mercurial/cext/osutil.c:752:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  752 |         if (pbuf->f_type == BTRFS_SUPER_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:788:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  788 |         if (pbuf->f_type == EFIVARFS_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:816:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  816 |         if (pbuf->f_type == F2FS_SUPER_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:836:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  836 |         if (pbuf->f_type == HPFS_SUPER_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:840:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  840 |         if (pbuf->f_type == HUGETLBFS_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:924:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  924 |         if (pbuf->f_type == RAMFS_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:940:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  940 |         if (pbuf->f_type == SELINUX_MAGIC)
      |                          ^~
mercurial/cext/osutil.c:996:26: warning: comparison of integer expressions of different signedness: '__fsword_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  996 |         if (pbuf->f_type == XENFS_SUPER_MAGIC)
      |                          ^~
hgext/fsmonitor/pywatchman/bser.c: In function 'bser_bytestring':
hgext/fsmonitor/pywatchman/bser.c:411:11: warning: comparison of integer expressions of different signedness: 'Py_ssize_t' {aka 'int'} and 'unsigned int' [-Wsign-compare]
  411 |   if (len > UINT32_MAX) {
      |           ^
mercurial/cext/parsers.c: In function 'parse_dirstate':
mercurial/cext/parsers.c:794:33: warning: comparison of integer expressions of different signedness: 'unsigned int' and 'Py_ssize_t' {aka 'int'} [-Wsign-compare]
  794 |         while (pos >= 40 && pos < len) {
      |                                 ^
mercurial/cext/parsers.c:795:30: warning: comparison of integer expressions of different signedness: 'unsigned int' and 'Py_ssize_t' {aka 'int'} [-Wsign-compare]
  795 |                 if (pos + 17 > len) {
      |                              ^
/usr/bin/make -C doc
make[3]: Entering directory '/<<PKGBUILDDIR>>/doc'
python3.12 gendoc.py "hg-ssh.8" > hg-ssh.8.txt.tmp
mv hg-ssh.8.txt.tmp hg-ssh.8.txt
python3.12 gendoc.py "hg-ssh.8.gendoc" > hg-ssh.8.gendoc.txt.tmp
mv hg-ssh.8.gendoc.txt.tmp hg-ssh.8.gendoc.txt
python3.12 gendoc.py "common" > common.txt.tmp
mv common.txt.tmp common.txt
python3.12 runrst hgmanpage  --halt warning \
  --strip-elements-with-class htmlonly hg-ssh.8.txt hg-ssh.8
python3.12 gendoc.py "hg.1" > hg.1.txt.tmp
mv hg.1.txt.tmp hg.1.txt
python3.12 gendoc.py "hg.1.gendoc" > hg.1.gendoc.txt.tmp
mv hg.1.gendoc.txt.tmp hg.1.gendoc.txt
python3.12 runrst hgmanpage  --halt warning \
  --strip-elements-with-class htmlonly hg.1.txt hg.1
python3.12 gendoc.py "hgignore.5" > hgignore.5.txt.tmp
mv hgignore.5.txt.tmp hgignore.5.txt
python3.12 gendoc.py "hgignore.5.gendoc" > hgignore.5.gendoc.txt.tmp
mv hgignore.5.gendoc.txt.tmp hgignore.5.gendoc.txt
python3.12 runrst hgmanpage  --halt warning \
  --strip-elements-with-class htmlonly hgignore.5.txt hgignore.5
python3.12 gendoc.py "hgrc.5" > hgrc.5.txt.tmp
mv hgrc.5.txt.tmp hgrc.5.txt
python3.12 gendoc.py "hgrc.5.gendoc" > hgrc.5.gendoc.txt.tmp
mv hgrc.5.gendoc.txt.tmp hgrc.5.gendoc.txt
python3.12 runrst hgmanpage  --halt warning \
  --strip-elements-with-class htmlonly hgrc.5.txt hgrc.5
python3.12 runrst html  --halt warning \
  --link-stylesheet --stylesheet-path style.css hg-ssh.8.txt hg-ssh.8.html
python3.12 runrst html  --halt warning \
  --link-stylesheet --stylesheet-path style.css hg.1.txt hg.1.html
python3.12 runrst html  --halt warning \
  --link-stylesheet --stylesheet-path style.css hgignore.5.txt hgignore.5.html
python3.12 runrst html  --halt warning \
  --link-stylesheet --stylesheet-path style.css hgrc.5.txt hgrc.5.html
make[3]: Leaving directory '/<<PKGBUILDDIR>>/doc'
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
/usr/bin/make build-chg
make[2]: Entering directory '/<<PKGBUILDDIR>>'
make -C contrib/chg
make[3]: Entering directory '/<<PKGBUILDDIR>>/contrib/chg'
cc -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -std=gnu99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2  -c -o chg.o chg.c
cc -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -std=gnu99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2  -c -o hgclient.o hgclient.c
cc -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -std=gnu99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2  -c -o procutil.o procutil.c
cc -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -std=gnu99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2  -c -o util.o util.c
cc -Wl,-z,relro -o chg chg.o hgclient.o procutil.o util.o
make[3]: Leaving directory '/<<PKGBUILDDIR>>/contrib/chg'
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
# Do not start a line with a word with a dot in a manpage
sed -i -e 's,^[.]\(hgignore\|hg/hgrc\),\\fP\1,' doc/hg.1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
   debian/rules override_dh_auto_test
make[1]: Entering directory '/<<PKGBUILDDIR>>'
http_proxy='' dh_auto_test -- PYTHON=python3 TESTFLAGS="--verbose --timeout 1800 --jobs 4 --blacklist /<<PKGBUILDDIR>>/debian/mercurial.test_blacklist"
	make -j4 check PYTHON=python3 "TESTFLAGS=--verbose --timeout 1800 --jobs 4 --blacklist /<<PKGBUILDDIR>>/debian/mercurial.test_blacklist"
make[2]: Entering directory '/<<PKGBUILDDIR>>'
if command -v cargo >/dev/null 2>&1; then \
	make rust-tests; \
	make cargo-clippy; \
fi
cd tests && python3 run-tests.py --verbose --timeout 1800 --jobs 4 --blacklist /<<PKGBUILDDIR>>/debian/mercurial.test_blacklist
# 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 /<<PKGBUILDDIR>>/tests 
# Using RUNTESTDIR /<<PKGBUILDDIR>>/tests 
# Using HGTMP /tmp/hgtests.qiewis6n 
# Using PATH /tmp/hgtests.qiewis6n/custom-bin:/tmp/hgtests.qiewis6n/install/bin:/<<PKGBUILDDIR>>/tests:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games 
# Using PYTHONPATH /tmp/hgtests.qiewis6n/install/lib/python:/<<PKGBUILDDIR>>/tests:/<<PKGBUILDDIR>>/tests 
# Writing to directory /<<PKGBUILDDIR>>/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.qiewis6n/build" install --force --prefix="/tmp/hgtests.qiewis6n/install" --install-lib="/tmp/hgtests.qiewis6n/install/lib/python" --install-scripts="/tmp/hgtests.qiewis6n/install/bin" --home="" >/tmp/hgtests.qiewis6n/install.err 2>&1 
installed Mercurial in 45.78 seconds 
running 1024 tests using 4 parallel processes 
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
skipped blacklisted
test-contrib-perf.t
test-contrib-perf.t ... test-contrib-check-code.t
test-contrib-check-code.t ... test-obsolete-checkheads.t
test-obsolete-checkheads.t ... test-obsolete-check-push.t
test-obsolete-check-push.t ... # Test test-contrib-check-code.t 
# Test test-contrib-perf.t 
# Test test-obsolete-checkheads.t 
# Running sh "/tmp/hgtests.qiewis6n/child2/test-contrib-check-code.t.sh" 
# Test test-obsolete-check-push.t 
# Running sh "/tmp/hgtests.qiewis6n/child3/test-obsolete-checkheads.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child4/test-obsolete-check-push.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child1/test-contrib-perf.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-contrib-perf.t) 
test-run-tests.t
test-run-tests.t ... # Test test-run-tests.t 
# Timout reached for process 1046274 
# Running sh "/tmp/hgtests.qiewis6n/child5/test-run-tests.t.sh" 
# Ret was: 0 (test-contrib-check-code.t) 
ok
test-contrib-check-commit.t
test-contrib-check-commit.t ... # Test test-contrib-check-commit.t 
# Running sh "/tmp/hgtests.qiewis6n/child6/test-contrib-check-commit.t.sh" 
# Timout reached for process 1046250 
# Ret was: 0 (test-contrib-check-commit.t) 
ok
test-push-race.t#strict
test-push-race.t#strict ... # Test test-push-race.t#strict 
# Timout reached for process 1046330 
# Running sh "/tmp/hgtests.qiewis6n/child7/test-push-race.t-strict.sh" 
# Ret was: 0 (test-obsolete-check-push.t) 
ok
test-push-race.t#unrelated
test-push-race.t#unrelated ... # Test test-push-race.t#unrelated 
# Timout reached for process 1046256 
# Running sh "/tmp/hgtests.qiewis6n/child8/test-push-race.t-unrelated.sh" 
# Ret was: 0 (test-obsolete-checkheads.t) 
ok
test-imports-checker.t
test-imports-checker.t ... # Test test-imports-checker.t 
# Timout reached for process 1046252 
# Running sh "/tmp/hgtests.qiewis6n/child9/test-imports-checker.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-imports-checker.t) 
test-rebase-check-restore.t
test-rebase-check-restore.t ... # Test test-rebase-check-restore.t 
# Running sh "/tmp/hgtests.qiewis6n/child10/test-rebase-check-restore.t.sh" 
# Timout reached for process 1047152 
# Timout reached for process 1047156 
# Ret was: 0 (test-rebase-check-restore.t) 
ok
test-check-code.t
test-check-code.t ... # Test test-check-code.t 
# Running sh "/tmp/hgtests.qiewis6n/child11/test-check-code.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-code.t) 
test-push-checkheads-unpushed-D4.t
test-push-checkheads-unpushed-D4.t ... # Test test-push-checkheads-unpushed-D4.t 
# Running sh "/tmp/hgtests.qiewis6n/child12/test-push-checkheads-unpushed-D4.t.sh" 
# Timout reached for process 1047570 
# Ret was: 0 (test-push-checkheads-unpushed-D4.t) 
ok
test-push-checkheads-unpushed-D5.t
test-push-checkheads-unpushed-D5.t ... # Timout reached for process 1047575 
# Test test-push-checkheads-unpushed-D5.t 
# Running sh "/tmp/hgtests.qiewis6n/child13/test-push-checkheads-unpushed-D5.t.sh" 
# Ret was: 0 (test-push-checkheads-unpushed-D5.t) 
ok
test-push-checkheads-unpushed-D3.t
test-push-checkheads-unpushed-D3.t ... # Test test-push-checkheads-unpushed-D3.t 
# Running sh "/tmp/hgtests.qiewis6n/child14/test-push-checkheads-unpushed-D3.t.sh" 
# Timout reached for process 1047955 
# Ret was: 0 (test-push-checkheads-unpushed-D3.t) 
ok
test-push-checkheads-pruned-B8.t
test-push-checkheads-pruned-B8.t ... # Test test-push-checkheads-pruned-B8.t 
# Running sh "/tmp/hgtests.qiewis6n/child15/test-push-checkheads-pruned-B8.t.sh" 
# Timout reached for process 1048304 
# Timout reached for process 1046325 
# Ret was: 0 (test-run-tests.t) 
ok
test-push-checkheads-superceed-A7.t
test-push-checkheads-superceed-A7.t ... # Test test-push-checkheads-superceed-A7.t 
# Running sh "/tmp/hgtests.qiewis6n/child16/test-push-checkheads-superceed-A7.t.sh" 
# Ret was: 0 (test-push-race.t#strict) 
ok
test-push-checkheads-superceed-A6.t
test-push-checkheads-superceed-A6.t ... # Test test-push-checkheads-superceed-A6.t 
# Running sh "/tmp/hgtests.qiewis6n/child17/test-push-checkheads-superceed-A6.t.sh" 
# Timout reached for process 1046353 
# Ret was: 0 (test-push-checkheads-pruned-B8.t) 
ok
test-largefiles-update.t
test-largefiles-update.t ... # Test test-largefiles-update.t 
# Timout reached for process 1048611 
# Running sh "/tmp/hgtests.qiewis6n/child18/test-largefiles-update.t.sh" 
# Ret was: 0 (test-push-checkheads-superceed-A7.t) 
ok
test-push-checkheads-multibranches-E2.t
test-push-checkheads-multibranches-E2.t ... # Test test-push-checkheads-multibranches-E2.t 
# Running sh "/tmp/hgtests.qiewis6n/child19/test-push-checkheads-multibranches-E2.t.sh" 
# Timout reached for process 1048876 
# Timout reached for process 1046652 
# Ret was: 0 (test-push-race.t#unrelated) 
ok
test-push-checkheads-unpushed-D7.t
test-push-checkheads-unpushed-D7.t ... # Test test-push-checkheads-unpushed-D7.t 
# Running sh "/tmp/hgtests.qiewis6n/child20/test-push-checkheads-unpushed-D7.t.sh" 
# Ret was: 0 (test-push-checkheads-superceed-A6.t) 
ok
test-push-checkheads-unpushed-D2.t
test-push-checkheads-unpushed-D2.t ... # Test test-push-checkheads-unpushed-D2.t 
# Running sh "/tmp/hgtests.qiewis6n/child21/test-push-checkheads-unpushed-D2.t.sh" 
# Timout reached for process 1048952 
# Ret was: 0 (test-push-checkheads-multibranches-E2.t) 
ok
test-push-checkheads-pruned-B5.t
test-push-checkheads-pruned-B5.t ... # Test test-push-checkheads-pruned-B5.t 
# Running sh "/tmp/hgtests.qiewis6n/child22/test-push-checkheads-pruned-B5.t.sh" 
# Timout reached for process 1049109 
# Ret was: 0 (test-push-checkheads-unpushed-D2.t) 
ok
test-push-checkheads-multibranches-E3.t
test-push-checkheads-multibranches-E3.t ... # Test test-push-checkheads-multibranches-E3.t 
# Running sh "/tmp/hgtests.qiewis6n/child23/test-push-checkheads-multibranches-E3.t.sh" 
# Timout reached for process 1049152 
# Ret was: 0 (test-push-checkheads-unpushed-D7.t) 
ok
test-merge-combination-file-content.t
test-merge-combination-file-content.t ... # Test test-merge-combination-file-content.t 
# Running sh "/tmp/hgtests.qiewis6n/child24/test-merge-combination-file-content.t.sh" 
# Timout reached for process 1049139 
# Ret was: 0 (test-push-checkheads-multibranches-E3.t) 
ok
test-push-checkheads-superceed-A3.t
test-push-checkheads-superceed-A3.t ... # Test test-push-checkheads-superceed-A3.t 
# Running sh "/tmp/hgtests.qiewis6n/child25/test-push-checkheads-superceed-A3.t.sh" 
# Timout reached for process 1049273 
# Timout reached for process 1049259 
# Ret was: 0 (test-push-checkheads-pruned-B5.t) 
ok
test-push-checkheads-superceed-A2.t
test-push-checkheads-superceed-A2.t ... # Test test-push-checkheads-superceed-A2.t 
# Running sh "/tmp/hgtests.qiewis6n/child26/test-push-checkheads-superceed-A2.t.sh" 
# Ret was: 0 (test-push-checkheads-superceed-A3.t) 
ok
test-push-checkheads-pruned-B2.t
test-push-checkheads-pruned-B2.t ... # Test test-push-checkheads-pruned-B2.t 
# Running sh "/tmp/hgtests.qiewis6n/child27/test-push-checkheads-pruned-B2.t.sh" 
# Timout reached for process 1049419 
# Ret was: 0 (test-push-checkheads-superceed-A2.t) 
ok
test-push-checkheads-multibranches-E1.t
test-push-checkheads-multibranches-E1.t ... # Test test-push-checkheads-multibranches-E1.t 
# Running sh "/tmp/hgtests.qiewis6n/child28/test-push-checkheads-multibranches-E1.t.sh" 
# Timout reached for process 1049426 
# Ret was: 0 (test-push-checkheads-pruned-B2.t) 
ok
test-push-checkheads-pruned-B3.t
test-push-checkheads-pruned-B3.t ... # Test test-push-checkheads-pruned-B3.t 
# Running sh "/tmp/hgtests.qiewis6n/child29/test-push-checkheads-pruned-B3.t.sh" 
# Timout reached for process 1049566 
# Ret was: 0 (test-push-checkheads-multibranches-E1.t) 
ok
test-push-checkheads-pruned-B4.t
test-push-checkheads-pruned-B4.t ... # Test test-push-checkheads-pruned-B4.t 
# Running sh "/tmp/hgtests.qiewis6n/child30/test-push-checkheads-pruned-B4.t.sh" 
# Timout reached for process 1049575 
# Ret was: 0 (test-push-checkheads-pruned-B4.t) 
ok
test-push-checkheads-unpushed-D6.t
test-push-checkheads-unpushed-D6.t ... # Test test-push-checkheads-unpushed-D6.t 
# Running sh "/tmp/hgtests.qiewis6n/child31/test-push-checkheads-unpushed-D6.t.sh" 
# Timout reached for process 1049691 
# Ret was: 0 (test-push-checkheads-pruned-B3.t) 
ok
test-push-checkheads-partial-C2.t
test-push-checkheads-partial-C2.t ... # Test test-push-checkheads-partial-C2.t 
# Running sh "/tmp/hgtests.qiewis6n/child32/test-push-checkheads-partial-C2.t.sh" 
# Timout reached for process 1049684 
# Ret was: 0 (test-push-checkheads-partial-C2.t) 
ok
test-push-checkheads-partial-C1.t
test-push-checkheads-partial-C1.t ... # Test test-push-checkheads-partial-C1.t 
# Running sh "/tmp/hgtests.qiewis6n/child33/test-push-checkheads-partial-C1.t.sh" 
# Timout reached for process 1049813 
# Ret was: 0 (test-push-checkheads-unpushed-D6.t) 
ok
test-push-checkheads-superceed-A8.t
test-push-checkheads-superceed-A8.t ... # Test test-push-checkheads-superceed-A8.t 
# Running sh "/tmp/hgtests.qiewis6n/child34/test-push-checkheads-superceed-A8.t.sh" 
# Timout reached for process 1049795 
# Ret was: 0 (test-push-checkheads-partial-C1.t) 
ok
test-push-checkheads-partial-C4.t
test-push-checkheads-partial-C4.t ... # Test test-push-checkheads-partial-C4.t 
# Running sh "/tmp/hgtests.qiewis6n/child35/test-push-checkheads-partial-C4.t.sh" 
# Timout reached for process 1049919 
# Ret was: 0 (test-push-checkheads-superceed-A8.t) 
ok
test-push-checkheads-pruned-B6.t
test-push-checkheads-pruned-B6.t ... # Test test-push-checkheads-pruned-B6.t 
# Running sh "/tmp/hgtests.qiewis6n/child36/test-push-checkheads-pruned-B6.t.sh" 
# Timout reached for process 1049940 
# Ret was: 0 (test-push-checkheads-partial-C4.t) 
ok
test-push-checkheads-pruned-B7.t
test-push-checkheads-pruned-B7.t ... # Test test-push-checkheads-pruned-B7.t 
# Running sh "/tmp/hgtests.qiewis6n/child37/test-push-checkheads-pruned-B7.t.sh" 
# Timout reached for process 1050298 
# Ret was: 0 (test-push-checkheads-pruned-B6.t) 
ok
test-merge-combination-exec-bytes.t
test-merge-combination-exec-bytes.t ... # Test test-merge-combination-exec-bytes.t 
# Timout reached for process 1050393 
# Running sh "/tmp/hgtests.qiewis6n/child38/test-merge-combination-exec-bytes.t.sh" 
# Timout reached for process 1049001 
# Ret was: 0 (test-largefiles-update.t) 
ok
test-push-checkheads-partial-C3.t
test-push-checkheads-partial-C3.t ... # Test test-push-checkheads-partial-C3.t 
# Running sh "/tmp/hgtests.qiewis6n/child39/test-push-checkheads-partial-C3.t.sh" 
# Ret was: 0 (test-push-checkheads-pruned-B7.t) 
ok
test-push-checkheads-unpushed-D1.t
test-push-checkheads-unpushed-D1.t ... # Test test-push-checkheads-unpushed-D1.t 
# Running sh "/tmp/hgtests.qiewis6n/child40/test-push-checkheads-unpushed-D1.t.sh" 
# Timout reached for process 1050463 
# Ret was: 0 (test-push-checkheads-partial-C3.t) 
ok
test-subrepo-svn.t
test-subrepo-svn.t ... # Test test-subrepo-svn.t 
# Timout reached for process 1050614 
# Running sh "/tmp/hgtests.qiewis6n/child41/test-subrepo-svn.t.sh" 
skipped missing feature: subversion client and admin tools >= 1.5
# Ret was: 80 (test-subrepo-svn.t) 
test-push-checkheads-superceed-A4.t
test-push-checkheads-superceed-A4.t ... # Test test-push-checkheads-superceed-A4.t 
# Running sh "/tmp/hgtests.qiewis6n/child42/test-push-checkheads-superceed-A4.t.sh" 
# Timout reached for process 1050750 
# Ret was: 0 (test-push-checkheads-unpushed-D1.t) 
ok
test-push-checkheads-superceed-A5.t
test-push-checkheads-superceed-A5.t ... # Test test-push-checkheads-superceed-A5.t 
# Running sh "/tmp/hgtests.qiewis6n/child43/test-push-checkheads-superceed-A5.t.sh" 
# Timout reached for process 1050628 
# Ret was: 0 (test-push-checkheads-superceed-A4.t) 
ok
test-merge-combination-misc.t
test-merge-combination-misc.t ... # Test test-merge-combination-misc.t 
# Running sh "/tmp/hgtests.qiewis6n/child44/test-merge-combination-misc.t.sh" 
# Timout reached for process 1050754 
# Ret was: 0 (test-push-checkheads-superceed-A5.t) 
ok
test-check-module-imports.t
test-check-module-imports.t ... # Test test-check-module-imports.t 
# Timout reached for process 1050767 
# Running sh "/tmp/hgtests.qiewis6n/child45/test-check-module-imports.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-module-imports.t) 
test-push-checkheads-pruned-B1.t
test-push-checkheads-pruned-B1.t ... # Test test-push-checkheads-pruned-B1.t 
# Running sh "/tmp/hgtests.qiewis6n/child46/test-push-checkheads-pruned-B1.t.sh" 
# Timout reached for process 1050907 
# Ret was: 0 (test-push-checkheads-pruned-B1.t) 
ok
test-push-checkheads-superceed-A1.t
test-push-checkheads-superceed-A1.t ... # Test test-push-checkheads-superceed-A1.t 
# Running sh "/tmp/hgtests.qiewis6n/child47/test-push-checkheads-superceed-A1.t.sh" 
# Timout reached for process 1050911 
# Ret was: 0 (test-merge-combination-misc.t) 
ok
test-copytrace-heuristics.t
test-copytrace-heuristics.t ... # Test test-copytrace-heuristics.t 
# Running sh "/tmp/hgtests.qiewis6n/child48/test-copytrace-heuristics.t.sh" 
# Timout reached for process 1050879 
# Ret was: 0 (test-push-checkheads-superceed-A1.t) 
ok
test-check-config.t
test-check-config.t ... # Test test-check-config.t 
# Timout reached for process 1051016 
# Running sh "/tmp/hgtests.qiewis6n/child49/test-check-config.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-config.t) 
test-glog-beautifygraph.t
test-glog-beautifygraph.t ... # Test test-glog-beautifygraph.t 
# Timout reached for process 1051144 
# Running sh "/tmp/hgtests.qiewis6n/child50/test-glog-beautifygraph.t.sh" 
# Ret was: 0 (test-merge-combination-exec-bytes.t) 
ok
test-gendoc-ja.t
test-gendoc-ja.t ... # Test test-gendoc-ja.t 
# Timout reached for process 1050520 
# Running sh "/tmp/hgtests.qiewis6n/child51/test-gendoc-ja.t.sh" 
# Ret was: 0 (test-gendoc-ja.t) 
ok
test-convert-cvs.t
test-convert-cvs.t ... # Test test-convert-cvs.t 
# Timout reached for process 1052032 
# Running sh "/tmp/hgtests.qiewis6n/child52/test-convert-cvs.t.sh" 
skipped missing feature: cvs client/server
# Ret was: 80 (test-convert-cvs.t) 
test-help.t
test-help.t ... # Test test-help.t 
# Timout reached for process 1052098 
# Running sh "/tmp/hgtests.qiewis6n/child53/test-help.t.sh" 
# Timout reached for process 1051066 
# Ret was: 0 (test-copytrace-heuristics.t) 
ok
test-copies-chain-merge.t#changeset
test-copies-chain-merge.t#changeset ... # Test test-copies-chain-merge.t#changeset 
# Running sh "/tmp/hgtests.qiewis6n/child54/test-copies-chain-merge.t-changeset.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#changeset) 
test-copies-chain-merge.t#compatibility
test-copies-chain-merge.t#compatibility ... # Test test-copies-chain-merge.t#compatibility 
# Timout reached for process 1052610 
# Running sh "/tmp/hgtests.qiewis6n/child55/test-copies-chain-merge.t-compatibility.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#compatibility) 
test-copies-chain-merge.t#filelog
test-copies-chain-merge.t#filelog ... # Test test-copies-chain-merge.t#filelog 
# Timout reached for process 1052621 
# Running sh "/tmp/hgtests.qiewis6n/child56/test-copies-chain-merge.t-filelog.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#filelog) 
test-copies-chain-merge.t#pull
test-copies-chain-merge.t#pull ... # Test test-copies-chain-merge.t#pull 
# Timout reached for process 1052636 
# Running sh "/tmp/hgtests.qiewis6n/child57/test-copies-chain-merge.t-pull.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#pull) 
test-copies-chain-merge.t#pull-upgrade
test-copies-chain-merge.t#pull-upgrade ... # Test test-copies-chain-merge.t#pull-upgrade 
# Timout reached for process 1052646 
# Running sh "/tmp/hgtests.qiewis6n/child58/test-copies-chain-merge.t-pull-upgrade.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#pull-upgrade) 
test-copies-chain-merge.t#push
test-copies-chain-merge.t#push ... # Test test-copies-chain-merge.t#push 
# Timout reached for process 1052656 
# Running sh "/tmp/hgtests.qiewis6n/child59/test-copies-chain-merge.t-push.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#push) 
test-copies-chain-merge.t#push-upgrade
test-copies-chain-merge.t#push-upgrade ... # Test test-copies-chain-merge.t#push-upgrade 
# Timout reached for process 1052669 
# Running sh "/tmp/hgtests.qiewis6n/child60/test-copies-chain-merge.t-push-upgrade.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#push-upgrade) 
test-copies-chain-merge.t#sidedata
test-copies-chain-merge.t#sidedata ... # Test test-copies-chain-merge.t#sidedata 
# Timout reached for process 1052685 
# Running sh "/tmp/hgtests.qiewis6n/child61/test-copies-chain-merge.t-sidedata.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#sidedata) 
test-copies-chain-merge.t#upgraded
test-copies-chain-merge.t#upgraded ... # Test test-copies-chain-merge.t#upgraded 
# Timout reached for process 1052694 
# Running sh "/tmp/hgtests.qiewis6n/child62/test-copies-chain-merge.t-upgraded.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#upgraded) 
test-copies-chain-merge.t#upgraded-parallel
test-copies-chain-merge.t#upgraded-parallel ... # Test test-copies-chain-merge.t#upgraded-parallel 
# Timout reached for process 1052702 
# Running sh "/tmp/hgtests.qiewis6n/child63/test-copies-chain-merge.t-upgraded-parallel.sh" 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-copies-chain-merge.t#upgraded-parallel) 
test-check-py3-compat.t
test-check-py3-compat.t ... # Test test-check-py3-compat.t 
# Timout reached for process 1052714 
# Running sh "/tmp/hgtests.qiewis6n/child64/test-check-py3-compat.t.sh" 
skipped missing feature: running with pure Python code
# Ret was: 80 (test-check-py3-compat.t) 
test-obsolete-bounds-checking.t
test-obsolete-bounds-checking.t ... # Test test-obsolete-bounds-checking.t 
# Running sh "/tmp/hgtests.qiewis6n/child65/test-obsolete-bounds-checking.t.sh" 
# Timout reached for process 1052723 
# Ret was: 0 (test-obsolete-bounds-checking.t) 
ok
test-dirstate-status-write-race.t#dirstate-v1
test-dirstate-status-write-race.t#dirstate-v1 ... # Test test-dirstate-status-write-race.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child66/test-dirstate-status-write-race.t-dirstate-v1.sh" 
# Timout reached for process 1052730 
# Ret was: 0 (test-merge-combination-file-content.t) 
ok
test-dirstate-status-write-race.t#dirstate-v2-append
test-dirstate-status-write-race.t#dirstate-v2-append ... # Test test-dirstate-status-write-race.t#dirstate-v2-append 
# Timout reached for process 1049291 
# Running sh "/tmp/hgtests.qiewis6n/child67/test-dirstate-status-write-race.t-dirstate-v2-append.sh" 
# Ret was: 0 (test-dirstate-status-write-race.t#dirstate-v1) 
ok
test-dirstate-status-write-race.t#dirstate-v2-rewrite
test-dirstate-status-write-race.t#dirstate-v2-rewrite ... # Test test-dirstate-status-write-race.t#dirstate-v2-rewrite 
# Timout reached for process 1052777 
# Running sh "/tmp/hgtests.qiewis6n/child68/test-dirstate-status-write-race.t-dirstate-v2-rewrite.sh" 
# Timout reached for process 1052127 
# Ret was: 0 (test-help.t) 
ok
test-convert-svn-sink.t
test-convert-svn-sink.t ... # Test test-convert-svn-sink.t 
# Running sh "/tmp/hgtests.qiewis6n/child69/test-convert-svn-sink.t.sh" 
skipped missing feature: subversion client and admin tools >= 1.3
# Ret was: 80 (test-convert-svn-sink.t) 
test-gendoc.t
test-gendoc.t ... # Test test-gendoc.t 
# Timout reached for process 1053402 
# Running sh "/tmp/hgtests.qiewis6n/child70/test-gendoc.t.sh" 
# Ret was: 0 (test-dirstate-status-write-race.t#dirstate-v2-append) 
ok
test-glog.t
test-glog.t ... # Test test-glog.t 
# Timout reached for process 1052930 
# Running sh "/tmp/hgtests.qiewis6n/child71/test-glog.t.sh" 
# Ret was: 0 (test-gendoc.t) 
ok
test-patchbomb.t
test-patchbomb.t ... # Timout reached for process 1053445 
# Test test-patchbomb.t 
# Running sh "/tmp/hgtests.qiewis6n/child72/test-patchbomb.t.sh" 
# Ret was: 0 (test-dirstate-status-write-race.t#dirstate-v2-rewrite) 
ok
test-obsolete-bundle-strip.t
test-obsolete-bundle-strip.t ... # Test test-obsolete-bundle-strip.t 
# Running sh "/tmp/hgtests.qiewis6n/child73/test-obsolete-bundle-strip.t.sh" 
# Timout reached for process 1053234 
# Ret was: 0 (test-glog-beautifygraph.t) 
ok
test-convert-svn-encoding.t
test-convert-svn-encoding.t ... # Test test-convert-svn-encoding.t 
# Timout reached for process 1051163 
# Running sh "/tmp/hgtests.qiewis6n/child74/test-convert-svn-encoding.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-svn-encoding.t) 
test-obsmarker-template.t
test-obsmarker-template.t ... # Test test-obsmarker-template.t 
# Running sh "/tmp/hgtests.qiewis6n/child75/test-obsmarker-template.t.sh" 
# Timout reached for process 1054259 
# Timout reached for process 1053719 
# Ret was: 0 (test-patchbomb.t) 
ok
test-check-help.t
test-check-help.t ... # Test test-check-help.t 
# Running sh "/tmp/hgtests.qiewis6n/child76/test-check-help.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-help.t) 
test-convert-svn-source.t
test-convert-svn-source.t ... # Test test-convert-svn-source.t 
# Timout reached for process 1054493 
# Running sh "/tmp/hgtests.qiewis6n/child77/test-convert-svn-source.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-svn-source.t) 
test-dirstate-read-race.t#dirstate-v1#pre-all-read
test-dirstate-read-race.t#dirstate-v1#pre-all-read ... # Test test-dirstate-read-race.t#dirstate-v1#pre-all-read 
# Timout reached for process 1054507 
# Running sh "/tmp/hgtests.qiewis6n/child78/test-dirstate-read-race.t-dirstate-v1-pre-all-read.sh" 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v1#pre-all-read) 
ok
test-dirstate-read-race.t#dirstate-v1#pre-some-read
test-dirstate-read-race.t#dirstate-v1#pre-some-read ... # Test test-dirstate-read-race.t#dirstate-v1#pre-some-read 
# Timout reached for process 1054528 
# Running sh "/tmp/hgtests.qiewis6n/child79/test-dirstate-read-race.t-dirstate-v1-pre-some-read.sh" 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v1#pre-some-read) 
ok
test-dirstate-read-race.t#dirstate-v2-append#pre-all-read
test-dirstate-read-race.t#dirstate-v2-append#pre-all-read ... # Test test-dirstate-read-race.t#dirstate-v2-append#pre-all-read 
# Timout reached for process 1054837 
# Running sh "/tmp/hgtests.qiewis6n/child80/test-dirstate-read-race.t-dirstate-v2-append-pre-all-read.sh" 
# Timout reached for process 1055122 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v2-append#pre-all-read) 
ok
test-dirstate-read-race.t#dirstate-v2-append#pre-some-read
test-dirstate-read-race.t#dirstate-v2-append#pre-some-read ... # Test test-dirstate-read-race.t#dirstate-v2-append#pre-some-read 
# Running sh "/tmp/hgtests.qiewis6n/child81/test-dirstate-read-race.t-dirstate-v2-append-pre-some-read.sh" 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v2-append#pre-some-read) 
ok
test-dirstate-read-race.t#dirstate-v2-rewrite#pre-all-read
test-dirstate-read-race.t#dirstate-v2-rewrite#pre-all-read ... # Test test-dirstate-read-race.t#dirstate-v2-rewrite#pre-all-read 
# Timout reached for process 1055444 
# Running sh "/tmp/hgtests.qiewis6n/child82/test-dirstate-read-race.t-dirstate-v2-rewrite-pre-all-read.sh" 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v2-rewrite#pre-all-read) 
ok
test-dirstate-read-race.t#dirstate-v2-rewrite#pre-some-read
test-dirstate-read-race.t#dirstate-v2-rewrite#pre-some-read ... # Test test-dirstate-read-race.t#dirstate-v2-rewrite#pre-some-read 
# Timout reached for process 1055710 
# Running sh "/tmp/hgtests.qiewis6n/child83/test-dirstate-read-race.t-dirstate-v2-rewrite-pre-some-read.sh" 
# Ret was: 0 (test-dirstate-read-race.t#dirstate-v2-rewrite#pre-some-read) 
ok
test-abort-checkin.t
test-abort-checkin.t ... # Test test-abort-checkin.t 
# Running sh "/tmp/hgtests.qiewis6n/child84/test-abort-checkin.t.sh" 
# Timout reached for process 1055982 
# Ret was: 0 (test-abort-checkin.t) 
ok
test-check-shbang.t
test-check-shbang.t ... # Test test-check-shbang.t 
# Timout reached for process 1056234 
# Running sh "/tmp/hgtests.qiewis6n/child85/test-check-shbang.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-shbang.t) 
test-acl.t
test-acl.t ... # Test test-acl.t 
# Running sh "/tmp/hgtests.qiewis6n/child86/test-acl.t.sh" 
# Timout reached for process 1056272 
# Timout reached for process 1053510 
# Ret was: 0 (test-glog.t) 
ok
test-upgrade-repo.t
test-upgrade-repo.t ... # Test test-upgrade-repo.t 
# Running sh "/tmp/hgtests.qiewis6n/child87/test-upgrade-repo.t.sh" 
# Timout reached for process 1056276 
# Ret was: 0 (test-acl.t) 
ok
test-check-encoding.t
test-check-encoding.t ... # Test test-check-encoding.t 
# Running sh "/tmp/hgtests.qiewis6n/child88/test-check-encoding.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-encoding.t) 
test-check-commit.t
test-check-commit.t ... # Test test-check-commit.t 
# Timout reached for process 1057114 
# Running sh "/tmp/hgtests.qiewis6n/child89/test-check-commit.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-commit.t) 
test-convert-svn-move.t
test-convert-svn-move.t ... # Test test-convert-svn-move.t 
# Timout reached for process 1057130 
# Running sh "/tmp/hgtests.qiewis6n/child90/test-convert-svn-move.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-svn-move.t) 
test-hgweb-commands.t
test-hgweb-commands.t ... # Test test-hgweb-commands.t 
# Timout reached for process 1057141 
# Running sh "/tmp/hgtests.qiewis6n/child91/test-hgweb-commands.t.sh" 
# Timout reached for process 1054263 
# Ret was: 0 (test-obsmarker-template.t) 
ok
test-check-interfaces.py
test-check-interfaces.py ... # Test test-check-interfaces.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-check-interfaces.py" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-interfaces.py) 
test-obsolete.t
test-obsolete.t ... # Test test-obsolete.t 
# Timout reached for process 1057251 
# Running sh "/tmp/hgtests.qiewis6n/child93/test-obsolete.t.sh" 
# Killing daemon process 1057621 
# Timout reached for process 1057163 
# Daemon process 1057621 is stuck - really killing it 
# Ret was: 0 (test-hgweb-commands.t) 
ok
test-log.t
test-log.t ... # Test test-log.t 
# Running sh "/tmp/hgtests.qiewis6n/child94/test-log.t.sh" 
# Ret was: 0 (test-obsolete-bundle-strip.t) 
ok
test-check-pylint.t
test-check-pylint.t ... # Test test-check-pylint.t 
# Timout reached for process 1053736 
# Running sh "/tmp/hgtests.qiewis6n/child95/test-check-pylint.t.sh" 
skipped missing feature: Pylint python linter
# Ret was: 80 (test-check-pylint.t) 
test-extension.t
test-extension.t ... # Test test-extension.t 
# Timout reached for process 1057800 
# Running sh "/tmp/hgtests.qiewis6n/child96/test-extension.t.sh" 
# Timout reached for process 1056729 
# Ret was: 0 (test-upgrade-repo.t) 
ok
test-hgweb-symrev.t
test-hgweb-symrev.t ... # Test test-hgweb-symrev.t 
# Running sh "/tmp/hgtests.qiewis6n/child97/test-hgweb-symrev.t.sh" 
# Timout reached for process 1058008 
# Ret was: 0 (test-hgweb-symrev.t) 
ok
test-dirstate-race.t#dirstate-v1
test-dirstate-race.t#dirstate-v1 ... # Test test-dirstate-race.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child98/test-dirstate-race.t-dirstate-v1.sh" 
# Timout reached for process 1057832 
# Ret was: 0 (test-extension.t) 
ok
test-dirstate-race.t#dirstate-v2
test-dirstate-race.t#dirstate-v2 ... # Test test-dirstate-race.t#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child99/test-dirstate-race.t-dirstate-v2.sh" 
# Ret was: 0 (test-dirstate-race.t#dirstate-v1) 
ok
test-check-execute.t
test-check-execute.t ... # Test test-check-execute.t 
# Timout reached for process 1058591 
# Running sh "/tmp/hgtests.qiewis6n/child100/test-check-execute.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-execute.t) 
test-transaction-wc-rollback-race.t#bookmarks-in-store
test-transaction-wc-rollback-race.t#bookmarks-in-store ... # Test test-transaction-wc-rollback-race.t#bookmarks-in-store 
# Timout reached for process 1058945 
# Running sh "/tmp/hgtests.qiewis6n/child101/test-transaction-wc-rollback-race.t-bookmarks-in-store.sh" 
# Ret was: 0 (test-dirstate-race.t#dirstate-v2) 
ok
test-transaction-wc-rollback-race.t#bookmarks-wc-level
test-transaction-wc-rollback-race.t#bookmarks-wc-level ... # Test test-transaction-wc-rollback-race.t#bookmarks-wc-level 
# Running sh "/tmp/hgtests.qiewis6n/child102/test-transaction-wc-rollback-race.t-bookmarks-wc-level.sh" 
# Timout reached for process 1058764 
# Ret was: 0 (test-transaction-wc-rollback-race.t#bookmarks-in-store) 
ok
test-setdiscovery.t
test-setdiscovery.t ... # Test test-setdiscovery.t 
# Timout reached for process 1058954 
# Running sh "/tmp/hgtests.qiewis6n/child103/test-setdiscovery.t.sh" 
# Ret was: 0 (test-transaction-wc-rollback-race.t#bookmarks-wc-level) 
ok
test-template-map.t
test-template-map.t ... # Test test-template-map.t 
# Timout reached for process 1059125 
# Running sh "/tmp/hgtests.qiewis6n/child104/test-template-map.t.sh" 
# Timout reached for process 1057273 
# Ret was: 0 (test-obsolete.t) 
ok
test-hgweb-filelog.t
test-hgweb-filelog.t ... # Test test-hgweb-filelog.t 
# Running sh "/tmp/hgtests.qiewis6n/child105/test-hgweb-filelog.t.sh" 
# Timout reached for process 1060179 
# Ret was: 0 (test-setdiscovery.t) 
ok
test-hgwebdir.t
test-hgwebdir.t ... # Test test-hgwebdir.t 
# Running sh "/tmp/hgtests.qiewis6n/child106/test-hgwebdir.t.sh" 
# Timout reached for process 1060876 
# Killing daemon process 1060971 
# Daemon process 1060971 is stuck - really killing it 
# Ret was: 0 (test-hgweb-filelog.t) 
ok
test-revset.t
test-revset.t ... # Test test-revset.t 
# Running sh "/tmp/hgtests.qiewis6n/child107/test-revset.t.sh" 
# Timout reached for process 1057772 
# Ret was: 0 (test-log.t) 
ok
test-bundle2-format.t
test-bundle2-format.t ... # Test test-bundle2-format.t 
# Running sh "/tmp/hgtests.qiewis6n/child108/test-bundle2-format.t.sh" 
# Timout reached for process 1060598 
# Ret was: 0 (test-template-map.t) 
ok
test-hgweb-json.t
test-hgweb-json.t ... # Test test-hgweb-json.t 
# Running sh "/tmp/hgtests.qiewis6n/child109/test-hgweb-json.t.sh" 
# Ret was: 0 (test-bundle2-format.t) 
ok
test-convert-cvs-detectmerge.t
test-convert-cvs-detectmerge.t ... # Test test-convert-cvs-detectmerge.t 
# Timout reached for process 1061374 
# Running sh "/tmp/hgtests.qiewis6n/child110/test-convert-cvs-detectmerge.t.sh" 
skipped missing feature: cvs client/server
# Ret was: 80 (test-convert-cvs-detectmerge.t) 
test-subrepo.t
test-subrepo.t ... # Test test-subrepo.t 
# Running sh "/tmp/hgtests.qiewis6n/child111/test-subrepo.t.sh" 
# Timout reached for process 1061707 
# Timout reached for process 1061044 
# Ret was: 0 (test-hgwebdir.t) 
ok
test-subrepo-deep-nested-change.t
test-subrepo-deep-nested-change.t ... # Test test-subrepo-deep-nested-change.t 
# Running sh "/tmp/hgtests.qiewis6n/child112/test-subrepo-deep-nested-change.t.sh" 
# Timout reached for process 1061657 
# Killing daemon process 1061953 
# Ret was: 0 (test-hgweb-json.t) 
ok
test-http-bad-server.t
test-http-bad-server.t ... # Test test-http-bad-server.t 
# Running sh "/tmp/hgtests.qiewis6n/child113/test-http-bad-server.t.sh" 
# Timout reached for process 1061971 
# Ret was: 0 (test-http-bad-server.t) 
ok
test-merge-tools.t
test-merge-tools.t ... # Test test-merge-tools.t 
# Running sh "/tmp/hgtests.qiewis6n/child114/test-merge-tools.t.sh" 
# Timout reached for process 1061790 
# Ret was: 0 (test-subrepo-deep-nested-change.t) 
ok
test-fix.t
test-fix.t ... # Test test-fix.t 
# Running sh "/tmp/hgtests.qiewis6n/child115/test-fix.t.sh" 
# Timout reached for process 1061712 
# Ret was: 0 (test-subrepo.t) 
ok
test-gendoc-ro.t
test-gendoc-ro.t ... # Test test-gendoc-ro.t 
# Running sh "/tmp/hgtests.qiewis6n/child116/test-gendoc-ro.t.sh" 
# Ret was: 0 (test-gendoc-ro.t) 
ok
test-import.t
test-import.t ... # Test test-import.t 
# Timout reached for process 1064534 
# Running sh "/tmp/hgtests.qiewis6n/child117/test-import.t.sh" 
# Timout reached for process 1062583 
# Ret was: 0 (test-merge-tools.t) 
ok
test-ssh-proto-unbundle.t
test-ssh-proto-unbundle.t ... # Test test-ssh-proto-unbundle.t 
# Running sh "/tmp/hgtests.qiewis6n/child118/test-ssh-proto-unbundle.t.sh" 
# Ret was: 0 (test-revset.t) 
ok
test-bookmarks-pushpull.t#b2-binary
test-bookmarks-pushpull.t#b2-binary ... # Test test-bookmarks-pushpull.t#b2-binary 
# Timout reached for process 1061113 
# Running sh "/tmp/hgtests.qiewis6n/child119/test-bookmarks-pushpull.t-b2-binary.sh" 

--- /<<PKGBUILDDIR>>/tests/test-fix.t
+++ /<<PKGBUILDDIR>>/tests/test-fix.t.err
@@ -1546,7 +1546,12 @@
   > done
   $ hg branch -q r0
   $ hg ci -Aqm 'r0'
+  Bus error
+  [135]
   $ hg phase -p
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ make_test_files() {
   >   printf "world\n" >> "mod_in_$1.changed"
   >   printf "world\n" >> "mod_in_$1.whole"
@@ -1563,198 +1568,52 @@
   >   hg ci -Aqm "$2"
   > }
   $ make_test_commit r1 "merge me, pt1"
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg co -q ".^"
+  abort: empty revision set
+  [10]
   $ make_test_commit r2 "merge me, pt2"
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg merge -qr 1
+  abort: unknown revision '1'
+  [10]
   $ make_test_commit merge "evil merge"
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ make_test_commit child "child of merge"
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ make_test_files wdir
   $ hg fix -r 'not public()' -w
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -G -T'{rev}:{shortest(node,8)}: branch:{branch} desc:{desc}'
-  @  8:c22ce900: branch:child desc:child of merge
-  |
-  o    7:5a30615a: branch:merge desc:evil merge
-  |\
-  | o  6:4e5acdc4: branch:r2 desc:merge me, pt2
-  | |
-  o |  5:eea01878: branch:r1 desc:merge me, pt1
-  |/
-  o  0:0c548d87: branch:r0 desc:r0
-  
   $ hg files -r tip
-  mod_in_child.changed
-  mod_in_child.ignored
-  mod_in_child.whole
-  mod_in_child_already_good.changed
-  mod_in_merge.changed
-  mod_in_merge.ignored
-  mod_in_merge.whole
-  mod_in_merge_already_good.changed
-  mod_in_mod_in_child_already_good.changed
-  mod_in_mod_in_merge_already_good.changed
-  mod_in_mod_in_r1_already_good.changed
-  mod_in_mod_in_r2_already_good.changed
-  mod_in_r0_already_good.changed
-  mod_in_r1.changed
-  mod_in_r1.ignored
-  mod_in_r1.whole
-  mod_in_r1_already_good.changed
-  mod_in_r2.changed
-  mod_in_r2.ignored
-  mod_in_r2.whole
-  mod_in_r2_already_good.changed
-  new_in_child.changed
-  new_in_child.ignored
-  new_in_child.whole
-  new_in_child_already_good.changed
-  new_in_merge.changed
-  new_in_merge.ignored
-  new_in_merge.whole
-  new_in_merge_already_good.changed
-  new_in_r1.changed
-  new_in_r1.ignored
-  new_in_r1.whole
-  new_in_r1_already_good.changed
-  new_in_r2.changed
-  new_in_r2.ignored
-  new_in_r2.whole
-  new_in_r2_already_good.changed
-  r0.changed
-  r0.ignored
-  r0.whole
+  [1]
   $ for f in "$(hg files -r tip)"; do hg cat -r tip $f -T'{path}:\n{data}\n'; done
-  mod_in_child.changed:
-  hello
-  WORLD
-  
-  mod_in_child.ignored:
-  hello
-  world
-  
-  mod_in_child.whole:
-  HELLO
-  WORLD
-  
-  mod_in_child_already_good.changed:
-  WORLD
-  
-  mod_in_merge.changed:
-  hello
-  WORLD
-  
-  mod_in_merge.ignored:
-  hello
-  world
-  
-  mod_in_merge.whole:
-  HELLO
-  WORLD
-  
-  mod_in_merge_already_good.changed:
-  WORLD
-  
-  mod_in_mod_in_child_already_good.changed:
-  HELLO
-  
-  mod_in_mod_in_merge_already_good.changed:
-  HELLO
-  
-  mod_in_mod_in_r1_already_good.changed:
-  HELLO
-  
-  mod_in_mod_in_r2_already_good.changed:
-  HELLO
-  
-  mod_in_r0_already_good.changed:
-  HELLO
-  
-  mod_in_r1.changed:
-  hello
-  WORLD
-  
-  mod_in_r1.ignored:
-  hello
-  world
-  
-  mod_in_r1.whole:
-  HELLO
-  WORLD
-  
-  mod_in_r1_already_good.changed:
-  WORLD
-  
-  mod_in_r2.changed:
-  hello
-  WORLD
-  
-  mod_in_r2.ignored:
-  hello
-  world
-  
-  mod_in_r2.whole:
-  HELLO
-  WORLD
-  
-  mod_in_r2_already_good.changed:
-  WORLD
-  
-  new_in_child.changed:
-  NEW IN CHILD
-  
-  new_in_child.ignored:
-  new in child
-  
-  new_in_child.whole:
-  NEW IN CHILD
-  
-  new_in_child_already_good.changed:
-  ALREADY GOOD, NEW IN THIS REV
-  
-  new_in_merge.changed:
-  NEW IN MERGE
-  
-  new_in_merge.ignored:
-  new in merge
-  
-  new_in_merge.whole:
-  NEW IN MERGE
-  
-  new_in_merge_already_good.changed:
-  ALREADY GOOD, NEW IN THIS REV
-  
-  new_in_r1.changed:
-  NEW IN R1
-  
-  new_in_r1.ignored:
-  new in r1
-  
-  new_in_r1.whole:
-  NEW IN R1
-  
-  new_in_r1_already_good.changed:
-  ALREADY GOOD, NEW IN THIS REV
-  
-  new_in_r2.changed:
-  NEW IN R2
-  
-  new_in_r2.ignored:
-  new in r2
-  
-  new_in_r2.whole:
-  NEW IN R2
-  
-  new_in_r2_already_good.changed:
-  ALREADY GOOD, NEW IN THIS REV
-  
-  r0.changed:
-  hello
-  
-  r0.ignored:
-  hello
-  
-  r0.whole:
-  hello
-  
+  hg cat: invalid arguments
+  hg cat [OPTION]... FILE...
+  
+  output the current or given revision of files
+  
+  options ([+] can be repeated):
+  
+   -o --output FORMAT       print output to file with formatted name
+   -r --rev REV             print the given revision
+      --decode              apply any matching decode filter
+   -I --include PATTERN [+] include names matching the given patterns
+   -X --exclude PATTERN [+] exclude names matching the given patterns
+   -T --template TEMPLATE   display with template
+  
+  (use 'hg cat -h' to show more help)
+  [10]
 
 We should execute the fixer tools as few times as possible, because they might
 be slow or expensive to execute. The inputs to each execution are effectively
# Timout reached for process 1062793 

ERROR: test-fix.t output changed
!# Ret was: 0 (test-fix.t) 
test-bookmarks-pushpull.t#b2-pushkey
test-bookmarks-pushpull.t#b2-pushkey ... # Test test-bookmarks-pushpull.t#b2-pushkey 
# Running sh "/tmp/hgtests.qiewis6n/child120/test-bookmarks-pushpull.t-b2-pushkey.sh" 
# Ret was: 0 (test-ssh-proto-unbundle.t) 
ok
test-bundle2-exchange.t
test-bundle2-exchange.t ... # Test test-bundle2-exchange.t 
# Running sh "/tmp/hgtests.qiewis6n/child121/test-bundle2-exchange.t.sh" 
# Timout reached for process 1064650 
# Killing daemon process 1066702 
# Timout reached for process 1065056 
# Daemon process 1066702 is stuck - really killing it 
# Ret was: 0 (test-bundle2-exchange.t) 
ok
test-phases-exchange.t
test-phases-exchange.t ... # Test test-phases-exchange.t 
# Running sh "/tmp/hgtests.qiewis6n/child122/test-phases-exchange.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-import.t
+++ /<<PKGBUILDDIR>>/tests/test-import.t.err
@@ -1505,79 +1505,27 @@
   > diff blah
   > blah blah
   > EOF
+  Bus error
+  [135]
   $ hg --config diff.git=1 log -pv
-  changeset:   0:c6ef204ef767
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  files:       empty nonempty
-  description:
-  blah blah
-  diff blah
-  blah blah
-  
-  
-  diff --git a/empty b/empty
-  new file mode 100644
-  diff --git a/nonempty b/nonempty
-  new file mode 100644
-  --- /dev/null
-  +++ b/nonempty
-  @@ -0,0 +1,1 @@
-  +nonempty
-  
 
  (without --git, empty file is lost, but commit message should be preserved)
 
   $ hg init plain
   $ hg export 0 | hg -R plain import -
   applying patch from stdin
+  abort: stdin: no diffs found
+  [10]
   $ hg --config diff.git=1 -R plain log -pv
-  changeset:   0:60a2d231e71f
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  files:       nonempty
-  description:
-  blah blah
-  diff blah
-  blah blah
-  
-  
-  diff --git a/nonempty b/nonempty
-  new file mode 100644
-  --- /dev/null
-  +++ b/nonempty
-  @@ -0,0 +1,1 @@
-  +nonempty
-  
 
  (with --git, patch contents should be fully preserved)
 
   $ hg init git
   $ hg --config diff.git=1 export 0 | hg -R git import -
   applying patch from stdin
+  abort: stdin: no diffs found
+  [10]
   $ hg --config diff.git=1 -R git log -pv
-  changeset:   0:c6ef204ef767
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  files:       empty nonempty
-  description:
-  blah blah
-  diff blah
-  blah blah
-  
-  
-  diff --git a/empty b/empty
-  new file mode 100644
-  diff --git a/nonempty b/nonempty
-  new file mode 100644
-  --- /dev/null
-  +++ b/nonempty
-  @@ -0,0 +1,1 @@
-  +nonempty
-  
 
   $ cd ..
 

ERROR: test-import.t output changed
!# Timout reached for process 1064588 
# Ret was: 0 (test-import.t) 
test-template-functions.t
test-template-functions.t ... # Test test-template-functions.t 
# Running sh "/tmp/hgtests.qiewis6n/child123/test-template-functions.t.sh" 
# Timout reached for process 1064718 
# Killing daemon process 1067297 
# Ret was: 0 (test-bookmarks-pushpull.t#b2-binary) 
ok
test-strip.t
test-strip.t ... # Test test-strip.t 
# Running sh "/tmp/hgtests.qiewis6n/child124/test-strip.t.sh" 
# Killing daemon process 1067457 
# Timout reached for process 1064997 
# Daemon process 1067457 is stuck - really killing it 
# Ret was: 0 (test-bookmarks-pushpull.t#b2-pushkey) 
ok
test-branches.t#mmap#v2
test-branches.t#mmap#v2 ... # Test test-branches.t#mmap#v2 
# Running sh "/tmp/hgtests.qiewis6n/child125/test-branches.t-mmap-v2.sh" 
# Timout reached for process 1066783 
# Ret was: 0 (test-phases-exchange.t) 
ok
test-branches.t#mmap#v3
test-branches.t#mmap#v3 ... # Test test-branches.t#mmap#v3 
# Running sh "/tmp/hgtests.qiewis6n/child126/test-branches.t-mmap-v3.sh" 
# Timout reached for process 1067729 
# Ret was: 0 (test-branches.t#mmap#v2) 
ok
test-branches.t#nommap#v2
test-branches.t#nommap#v2 ... # Test test-branches.t#nommap#v2 
# Running sh "/tmp/hgtests.qiewis6n/child127/test-branches.t-nommap-v2.sh" 
# Ret was: 0 (test-strip.t) 
ok
test-branches.t#nommap#v3
test-branches.t#nommap#v3 ... # Test test-branches.t#nommap#v3 
# Timout reached for process 1067551 
# Running sh "/tmp/hgtests.qiewis6n/child128/test-branches.t-nommap-v3.sh" 
# Ret was: 0 (test-template-functions.t) 
ok
test-lfs.t
test-lfs.t ... # Test test-lfs.t 
# Timout reached for process 1066822 
# Running sh "/tmp/hgtests.qiewis6n/child129/test-lfs.t.sh" 
# Timout reached for process 1067945 
# Ret was: 0 (test-branches.t#mmap#v3) 
ok
test-convert-cvsnt-mergepoints.t
test-convert-cvsnt-mergepoints.t ... # Test test-convert-cvsnt-mergepoints.t 
# Running sh "/tmp/hgtests.qiewis6n/child130/test-convert-cvsnt-mergepoints.t.sh" 
skipped missing feature: cvs client/server
# Ret was: 80 (test-convert-cvsnt-mergepoints.t) 
test-commit-interactive.t
test-commit-interactive.t ... # Test test-commit-interactive.t 
# Timout reached for process 1068849 
# Running sh "/tmp/hgtests.qiewis6n/child131/test-commit-interactive.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-commit-interactive.t
+++ /<<PKGBUILDDIR>>/tests/test-commit-interactive.t.err
@@ -371,6 +371,8 @@
   > NO_CHECK_EOF
   $ hg add f1.py
   $ hg commit -m funcs
+  Bus error
+  [135]
   $ cat > f1.py <<NO_CHECK_EOF
   > def annotate(ui, repo, *pats, **opts):
   >     """show changeset information by line for each file
@@ -409,50 +411,46 @@
   > y
   > EOF
   diff --git a/f1.py b/f1.py
-  3 hunks, 6 lines changed
+  new file mode 100644
   examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] y
   
-  @@ -2,8 +2,8 @@ def annotate(ui, repo, *pats, **opts):
-       """show changeset information by line for each file
-   
-       List changes in files, showing the revision id responsible for
-  -    each line.
+  @@ -0,0 +1,29 @@
+  +def annotate(ui, repo, *pats, **opts):
+  +    """show changeset information by line for each file
+  +
+  +    List changes in files, showing the revision id responsible for
   +    each line
-   
-       This command is useful for discovering when a change was made and
-       by whom.
-   
-  record change 1/3 to 'f1.py'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -6,11 +6,7 @@ def annotate(ui, repo, *pats, **opts):
-   
-       This command is useful for discovering when a change was made and
-       by whom.
-   
-  -    If you include -f/-u/-d, the revision number is suppressed unless
-  -    you also include -the revision number is suppressed unless
-  -    you also include -n.
-  -
-       Without the -a/--text option, annotate will avoid processing files
-       it detects as binary. With -a, annotate will annotate the file
-       anyway, although the results will probably be neither useful
-  record change 2/3 to 'f1.py'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts):
-       directory; use -r/--rev to specify a different revision.
-   
-       The archive type is automatically detected based on file
-  -    extension (to override, use -t/--type).
+  +
+  +    This command is useful for discovering when a change was made and
+  +    by whom.
+  +
+  +    Without the -a/--text option, annotate will avoid processing files
+  +    it detects as binary. With -a, annotate will annotate the file
+  +    anyway, although the results will probably be neither useful
+  +    nor desirable.
+  +
+  +    Returns 0 on success.
+  +    """
+  +    return 0
+  +def archive(ui, repo, dest, **opts):
+  +    '''create an unversioned archive of a repository revision
+  +
+  +    By default, the revision used is the parent of the working
+  +    directory; use -r/--rev to specify a different revision.
+  +
+  +    The archive type is automatically detected based on file
   +    extension (or override using -t/--type).
-   
-       .. container:: verbose
-   
-  record change 3/3 to 'f1.py'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  +
+  +    .. container:: verbose
+  +
+  +    Valid types are:
+  record this change to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Modify end of plain file, add EOL
 
@@ -484,6 +482,9 @@
   record change 2/2 to 'plain2'?
   (enter ? for help) [Ynesfdaq?] y
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 Modify beginning, trim end, record both, add another file to test
 changes numbering
 
@@ -517,46 +518,38 @@
    10
   -11
   -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   record change 2/3 to 'plain'?
   (enter ? for help) [Ynesfdaq?] y
   
   diff --git a/plain2 b/plain2
-  1 hunks, 1 lines changed
-  @@ -1,1 +1,2 @@
-   1
+  new file mode 100644
+  @@ -0,0 +1,2 @@
+  +1
   +2
   record change 3/3 to 'plain2'?
   (enter ? for help) [Ynesfdaq?] y
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg tip -p
-  changeset:   13:f941910cff62
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:10 1970 +0000
-  summary:     begin-and-end
-  
-  diff -r 33abe24d946c -r f941910cff62 plain
-  --- a/plain	Thu Jan 01 00:00:10 1970 +0000
-  +++ b/plain	Thu Jan 01 00:00:10 1970 +0000
-  @@ -1,4 +1,4 @@
-  -1
-  +2
-   2
-   3
-   4
-  @@ -8,5 +8,3 @@
-   8
-   9
-   10
-  -11
-  -7264f99c5f5ff3261504828afa4fb4d406c3af54
-  diff -r 33abe24d946c -r f941910cff62 plain2
-  --- a/plain2	Thu Jan 01 00:00:10 1970 +0000
-  +++ b/plain2	Thu Jan 01 00:00:10 1970 +0000
-  @@ -1,1 +1,2 @@
-   1
-  +2
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
 Trim beginning, modify end
@@ -573,9 +566,9 @@
   > y
   > EOF
   diff --git a/plain b/plain
-  2 hunks, 4 lines changed
+  2 hunks, 6 lines changed
   @@ -1,9 +1,6 @@
-  -2
+  -1
   -2
   -3
    4
@@ -587,7 +580,7 @@
   record change 1/2 to 'plain'?
   (enter ? for help) [Ynesfdaq?] n
   
-  @@ -4,7 +1,7 @@
+  @@ -4,9 +1,7 @@
    4
    5
    6
@@ -595,27 +588,33 @@
    8
    9
   -10
+  -11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   +10.new
   record change 2/2 to 'plain'?
   (enter ? for help) [Ynesfdaq?] y
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg tip -p
-  changeset:   14:4915f538659b
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:11 1970 +0000
-  summary:     end-only
-  
-  diff -r f941910cff62 -r 4915f538659b plain
-  --- a/plain	Thu Jan 01 00:00:10 1970 +0000
-  +++ b/plain	Thu Jan 01 00:00:11 1970 +0000
-  @@ -7,4 +7,4 @@
-   7
-   8
-   9
-  -10
-  +10.new
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
 Record beginning
@@ -625,76 +624,85 @@
   > y
   > EOF
   diff --git a/plain b/plain
-  1 hunks, 3 lines changed
-  @@ -1,6 +1,3 @@
-  -2
+  2 hunks, 6 lines changed
+  @@ -1,9 +1,6 @@
+  -1
   -2
   -3
    4
    5
    6
-  record this change to 'plain'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-
-  $ hg tip -p
-  changeset:   15:1b1f93d4b94b
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:12 1970 +0000
-  summary:     begin-only
-  
-  diff -r 4915f538659b -r 1b1f93d4b94b plain
-  --- a/plain	Thu Jan 01 00:00:11 1970 +0000
-  +++ b/plain	Thu Jan 01 00:00:12 1970 +0000
-  @@ -1,6 +1,3 @@
-  -2
-  -2
-  -3
-   4
-   5
-   6
-  
-
-Add to beginning, trim from end
-
-  $ rm plain
-  $ for i in 1 2 3 4 5 6 7 8 9; do
-  >  echo $i >> plain
-  > done
-
-Record end
-
-  $ hg commit -i --traceback -d '13 0' -m end-again plain<<EOF
-  > n
-  > y
-  > EOF
-  diff --git a/plain b/plain
-  2 hunks, 4 lines changed
-  @@ -1,6 +1,9 @@
-  +1
-  +2
-  +3
+   7
+   8
+   9
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -4,9 +1,7 @@
    4
    5
    6
    7
    8
    9
-  record change 1/2 to 'plain'?
-  (enter ? for help) [Ynesfdaq?] n
-  
-  @@ -1,7 +4,6 @@
-   4
-   5
-   6
+  -10
+  -11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  +10.new
+  record change 2/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+
+  $ hg tip -p
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  
+
+Add to beginning, trim from end
+
+  $ rm plain
+  $ for i in 1 2 3 4 5 6 7 8 9; do
+  >  echo $i >> plain
+  > done
+
+Record end
+
+  $ hg commit -i --traceback -d '13 0' -m end-again plain<<EOF
+  > n
+  > y
+  > EOF
+  diff --git a/plain b/plain
+  1 hunks, 3 lines changed
+  @@ -7,6 +7,3 @@ 6
    7
    8
    9
-  -10.new
-  record change 2/2 to 'plain'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  -10
+  -11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  record this change to 'plain'?
+  (enter ? for help) [Ynesfdaq?] n
+  
+  no changes to record
+  [1]
 
 Add to beginning, middle, end
 
@@ -711,17 +719,9 @@
   > n
   > EOF
   diff --git a/plain b/plain
-  3 hunks, 7 lines changed
-  @@ -1,2 +1,5 @@
-  +1
-  +2
-  +3
-   4
-   5
-  record change 1/3 to 'plain'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,6 +4,8 @@
+  2 hunks, 3 lines changed
+  @@ -3,9 +3,11 @@ 2
+   3
    4
    5
   +5.new
@@ -730,34 +730,55 @@
    7
    8
    9
-  record change 2/3 to 'plain'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -3,4 +8,6 @@
+   10
+   11
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -6,7 +8,6 @@ 2
    6
    7
    8
    9
-  +10
-  +11
-  record change 3/3 to 'plain'?
-  (enter ? for help) [Ynesfdaq?] n
-  
+   10
+   11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  record change 2/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg tip -p
-  changeset:   17:41cf3f5c55ae
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:14 1970 +0000
-  summary:     middle-only
-  
-  diff -r a69d252246e1 -r 41cf3f5c55ae plain
-  --- a/plain	Thu Jan 01 00:00:13 1970 +0000
-  +++ b/plain	Thu Jan 01 00:00:14 1970 +0000
-  @@ -1,5 +1,10 @@
-  +1
-  +2
-  +3
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  
+
+Record end
+
+  $ hg commit -i -d '15 0' -m end-only plain <<EOF
+  > y
+  > y
+  > EOF
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  @@ -3,9 +3,11 @@ 2
+   3
    4
    5
   +5.new
@@ -765,42 +786,44 @@
    6
    7
    8
-  
-
-Record end
-
-  $ hg commit -i -d '15 0' -m end-only plain <<EOF
-  > y
-  > y
-  > EOF
-  diff --git a/plain b/plain
-  1 hunks, 2 lines changed
-  @@ -9,3 +9,5 @@ 6
+   9
+   10
+   11
+  record change 1/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -6,7 +8,6 @@ 2
+   6
    7
    8
    9
-  +10
-  +11
-  record this change to 'plain'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+   10
+   11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  record change 2/2 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg tip -p
-  changeset:   18:58a72f46bc24
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:15 1970 +0000
-  summary:     end-only
-  
-  diff -r 41cf3f5c55ae -r 58a72f46bc24 plain
-  --- a/plain	Thu Jan 01 00:00:14 1970 +0000
-  +++ b/plain	Thu Jan 01 00:00:15 1970 +0000
-  @@ -9,3 +9,5 @@
-   7
-   8
-   9
-  +10
-  +11
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 Interactive commit can name a directory instead of files (issue6131)
 
@@ -811,16 +834,9 @@
   > y
   > EOF
   adding subdir/a
-  diff --git a/subdir/a b/subdir/a
-  new file mode 100644
-  examine changes to 'subdir/a'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -0,0 +1,1 @@
-  +a
-  record this change to 'subdir/a'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ cd subdir
 
   $ echo a >> a
@@ -828,28 +844,25 @@
   > y
   > y
   > EOF
-  diff --git a/subdir/a b/subdir/a
-  1 hunks, 1 lines changed
-  @@ -1,1 +1,2 @@
-   a
-  +a
-  record this change to 'subdir/a'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  abort: subdir/a: file not tracked!
+  [10]
 
   $ hg tip -p
-  changeset:   20:e0f6b99f6c49
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:16 1970 +0000
-  summary:     subdir-change
-  
-  diff -r abd26b51de37 -r e0f6b99f6c49 subdir/a
-  --- a/subdir/a	Thu Jan 01 00:00:16 1970 +0000
-  +++ b/subdir/a	Thu Jan 01 00:00:16 1970 +0000
-  @@ -1,1 +1,2 @@
-   a
-  +a
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
   $ echo a > f1
@@ -857,6 +870,9 @@
   $ hg add f1 f2
 
   $ hg ci -mz -d '17 0'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ echo a >> f1
   $ echo b >> f2
@@ -867,9 +883,9 @@
   > ?
   > q
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] ?
   
   y - yes, record this change
@@ -881,7 +897,7 @@
   a - record all changes to all remaining files
   q - quit, recording no changes
   ? - ? (display help)
-  examine changes to 'subdir/f1'?
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
@@ -896,23 +912,23 @@
   > n
   > EOF
   diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
+  new file mode 100644
   examine changes to 'subdir/f1'?
   (enter ? for help) [Ynesfdaq?] y
   
-  @@ -1,1 +1,2 @@
-   a
+  @@ -0,0 +1,2 @@
+  +a
   +a
   record change 1/2 to 'subdir/f1'?
   (enter ? for help) [Ynesfdaq?] n
   
   diff --git a/subdir/f2 b/subdir/f2
-  1 hunks, 1 lines changed
+  new file mode 100644
   examine changes to 'subdir/f2'?
   (enter ? for help) [Ynesfdaq?] y
   
-  @@ -1,1 +1,2 @@
-   b
+  @@ -0,0 +1,2 @@
+  +b
   +b
   record change 2/2 to 'subdir/f2'?
   (enter ? for help) [Ynesfdaq?] n
@@ -969,14 +985,14 @@
   $ hg commit -i <<EOF
   > s
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] s
   
-  diff --git a/subdir/f2 b/subdir/f2
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'?
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
   (enter ? for help) [Ynesfdaq?] abort: response expected
   [255]
 
@@ -985,14 +1001,14 @@
   $ hg commit -i <<EOF
   > n
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] n
   
-  diff --git a/subdir/f2 b/subdir/f2
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'?
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
   (enter ? for help) [Ynesfdaq?] abort: response expected
   [255]
 
@@ -1002,14 +1018,14 @@
   > f
   > q
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] f
   
-  diff --git a/subdir/f2 b/subdir/f2
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'?
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
   (enter ? for help) [Ynesfdaq?] q
   
   abort: user quit
@@ -1021,30 +1037,36 @@
   > s
   > a
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] s
   
-  diff --git a/subdir/f2 b/subdir/f2
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f2'?
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
   (enter ? for help) [Ynesfdaq?] a
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg tip -p
-  changeset:   22:6afbbefacf35
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:18 1970 +0000
-  summary:     x
-  
-  diff -r b73c401c693c -r 6afbbefacf35 subdir/f2
-  --- a/subdir/f2	Thu Jan 01 00:00:17 1970 +0000
-  +++ b/subdir/f2	Thu Jan 01 00:00:18 1970 +0000
-  @@ -1,1 +1,2 @@
-   b
-  +b
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
 f
@@ -1052,25 +1074,33 @@
   $ hg commit -i -d '19 0' -my <<EOF
   > f
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
   (enter ? for help) [Ynesfdaq?] f
   
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
 
   $ hg tip -p
-  changeset:   23:715028a33949
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:19 1970 +0000
-  summary:     y
-  
-  diff -r 6afbbefacf35 -r 715028a33949 subdir/f1
-  --- a/subdir/f1	Thu Jan 01 00:00:18 1970 +0000
-  +++ b/subdir/f1	Thu Jan 01 00:00:19 1970 +0000
-  @@ -1,1 +1,2 @@
-   a
-  +a
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
 #if execbit
@@ -1084,9 +1114,268 @@
   > y
   > y
   > EOF
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -0,0 +1,29 @@
+  +def annotate(ui, repo, *pats, **opts):
+  +    """show changeset information by line for each file
+  +
+  +    List changes in files, showing the revision id responsible for
+  +    each line
+  +
+  +    This command is useful for discovering when a change was made and
+  +    by whom.
+  +
+  +    Without the -a/--text option, annotate will avoid processing files
+  +    it detects as binary. With -a, annotate will annotate the file
+  +    anyway, although the results will probably be neither useful
+  +    nor desirable.
+  +
+  +    Returns 0 on success.
+  +    """
+  +    return 0
+  +def archive(ui, repo, dest, **opts):
+  +    '''create an unversioned archive of a repository revision
+  +
+  +    By default, the revision used is the parent of the working
+  +    directory; use -r/--rev to specify a different revision.
+  +
+  +    The archive type is automatically detected based on file
+  +    extension (or override using -t/--type).
+  +
+  +    .. container:: verbose
+  +
+  +    Valid types are:
+  record change 1/6 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -3,9 +3,11 @@ 2
+   3
+   4
+   5
+  +5.new
+  +5.reallynew
+   6
+   7
+   8
+   9
+   10
+   11
+  record change 2/6 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
+
+  $ hg tip --config diff.git=True -p
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff --git a/plain b/plain
+  --- a/plain
+  +++ b/plain
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  
+
+Preserve execute permission on original
+
+  $ echo b >> f1
+  $ hg commit -i -d '21 0' -maa <<EOF
+  > y
+  > y
+  > y
+  > EOF
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -0,0 +1,29 @@
+  +def annotate(ui, repo, *pats, **opts):
+  +    """show changeset information by line for each file
+  +
+  +    List changes in files, showing the revision id responsible for
+  +    each line
+  +
+  +    This command is useful for discovering when a change was made and
+  +    by whom.
+  +
+  +    Without the -a/--text option, annotate will avoid processing files
+  +    it detects as binary. With -a, annotate will annotate the file
+  +    anyway, although the results will probably be neither useful
+  +    nor desirable.
+  +
+  +    Returns 0 on success.
+  +    """
+  +    return 0
+  +def archive(ui, repo, dest, **opts):
+  +    '''create an unversioned archive of a repository revision
+  +
+  +    By default, the revision used is the parent of the working
+  +    directory; use -r/--rev to specify a different revision.
+  +
+  +    The archive type is automatically detected based on file
+  +    extension (or override using -t/--type).
+  +
+  +    .. container:: verbose
+  +
+  +    Valid types are:
+  record change 1/6 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -3,9 +3,11 @@ 2
+   3
+   4
+   5
+  +5.new
+  +5.reallynew
+   6
+   7
+   8
+   9
+   10
+   11
+  record change 2/6 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
+
+  $ hg tip --config diff.git=True -p
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff --git a/plain b/plain
+  --- a/plain
+  +++ b/plain
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  
+
+Preserve chmod -x
+
+  $ chmod -x f1
+  $ echo c >> f1
+  $ hg commit -i -d '22 0' -mab <<EOF
+  > y
+  > y
+  > y
+  > EOF
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -0,0 +1,29 @@
+  +def annotate(ui, repo, *pats, **opts):
+  +    """show changeset information by line for each file
+  +
+  +    List changes in files, showing the revision id responsible for
+  +    each line
+  +
+  +    This command is useful for discovering when a change was made and
+  +    by whom.
+  +
+  +    Without the -a/--text option, annotate will avoid processing files
+  +    it detects as binary. With -a, annotate will annotate the file
+  +    anyway, although the results will probably be neither useful
+  +    nor desirable.
+  +
+  +    Returns 0 on success.
+  +    """
+  +    return 0
+  +def archive(ui, repo, dest, **opts):
+  +    '''create an unversioned archive of a repository revision
+  +
+  +    By default, the revision used is the parent of the working
+  +    directory; use -r/--rev to specify a different revision.
+  +
+  +    The archive type is automatically detected based on file
+  +    extension (or override using -t/--type).
+  +
+  +    .. container:: verbose
+  +
+  +    Valid types are:
+  record change 1/6 to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  diff --git a/plain b/plain
+  2 hunks, 3 lines changed
+  examine changes to 'plain'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -3,9 +3,11 @@ 2
+   3
+   4
+   5
+  +5.new
+  +5.reallynew
+   6
+   7
+   8
+   9
+   10
+   11
+  record change 2/6 to 'plain'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
+
+  $ hg tip --config diff.git=True -p
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff --git a/plain b/plain
+  --- a/plain
+  +++ b/plain
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  
+
+#else
+
+Slightly bogus tests to get almost same repo structure as when x bit is used
+- but with different hashes.
+
+Mock "Preserve chmod +x"
+
+  $ echo a >> f1
+  $ hg commit -i -d '20 0' -mz <<EOF
+  > y
+  > y
+  > y
+  > EOF
   diff --git a/subdir/f1 b/subdir/f1
-  old mode 100644
-  new mode 100755
   1 hunks, 1 lines changed
   examine changes to 'subdir/f1'?
   (enter ? for help) [Ynesfdaq?] y
@@ -1100,15 +1389,13 @@
   
 
   $ hg tip --config diff.git=True -p
-  changeset:   24:db967c1e5884
+  changeset:   24:c26cfe2c4eb0
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:20 1970 +0000
   summary:     z
   
   diff --git a/subdir/f1 b/subdir/f1
-  old mode 100644
-  new mode 100755
   --- a/subdir/f1
   +++ b/subdir/f1
   @@ -1,2 +1,3 @@
@@ -1117,7 +1404,7 @@
   +a
   
 
-Preserve execute permission on original
+Mock "Preserve execute permission on original"
 
   $ echo b >> f1
   $ hg commit -i -d '21 0' -maa <<EOF
@@ -1140,7 +1427,7 @@
   
 
   $ hg tip --config diff.git=True -p
-  changeset:   25:88903aef81c3
+  changeset:   25:a48d2d60adde
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:21 1970 +0000
@@ -1156,131 +1443,6 @@
   +b
   
 
-Preserve chmod -x
-
-  $ chmod -x f1
-  $ echo c >> f1
-  $ hg commit -i -d '22 0' -mab <<EOF
-  > y
-  > y
-  > y
-  > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  old mode 100755
-  new mode 100644
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -2,3 +2,4 @@ a
-   a
-   a
-   b
-  +c
-  record this change to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-
-  $ hg tip --config diff.git=True -p
-  changeset:   26:7af84b6cf560
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:22 1970 +0000
-  summary:     ab
-  
-  diff --git a/subdir/f1 b/subdir/f1
-  old mode 100755
-  new mode 100644
-  --- a/subdir/f1
-  +++ b/subdir/f1
-  @@ -2,3 +2,4 @@
-   a
-   a
-   b
-  +c
-  
-
-#else
-
-Slightly bogus tests to get almost same repo structure as when x bit is used
-- but with different hashes.
-
-Mock "Preserve chmod +x"
-
-  $ echo a >> f1
-  $ hg commit -i -d '20 0' -mz <<EOF
-  > y
-  > y
-  > y
-  > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,2 +1,3 @@
-   a
-   a
-  +a
-  record this change to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-
-  $ hg tip --config diff.git=True -p
-  changeset:   24:c26cfe2c4eb0
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:20 1970 +0000
-  summary:     z
-  
-  diff --git a/subdir/f1 b/subdir/f1
-  --- a/subdir/f1
-  +++ b/subdir/f1
-  @@ -1,2 +1,3 @@
-   a
-   a
-  +a
-  
-
-Mock "Preserve execute permission on original"
-
-  $ echo b >> f1
-  $ hg commit -i -d '21 0' -maa <<EOF
-  > y
-  > y
-  > y
-  > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,4 @@
-   a
-   a
-   a
-  +b
-  record this change to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-
-  $ hg tip --config diff.git=True -p
-  changeset:   25:a48d2d60adde
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:21 1970 +0000
-  summary:     aa
-  
-  diff --git a/subdir/f1 b/subdir/f1
-  --- a/subdir/f1
-  +++ b/subdir/f1
-  @@ -1,3 +1,4 @@
-   a
-   a
-   a
-  +b
-  
-
 Mock "Preserve chmod -x"
 
   $ chmod -x f1
@@ -1329,7 +1491,12 @@
 Abort early when a merge is in progress
 
   $ hg up 4
-  1 files updated, 0 files merged, 7 files removed, 0 files unresolved
+  file 'plain' was deleted in other [destination] but was modified in local [working copy].
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? 
+  1 files updated, 0 files merged, 1 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
 
   $ touch iwillmergethat
   $ hg add iwillmergethat
@@ -1339,20 +1506,27 @@
   (branches are permanent and global, did you want a bookmark?)
 
   $ hg ci -m'new head'
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [20]
 
   $ hg up default
-  7 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
+  [20]
 
   $ hg merge thatbranch
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  abort: unknown revision 'thatbranch'
+  [10]
 
   $ hg commit -i -m'will abort'
-  abort: cannot partially commit a merge (use "hg commit" instead)
-  [10]
+  diff --git a/f1.py b/f1.py
+  new file mode 100644
+  examine changes to 'f1.py'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
 
   $ hg up -C
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Editing patch (and ignoring trailing text)
 
@@ -1368,6 +1542,9 @@
   > __EOF__
   $ hg add editedfile
   $ hg commit -medit-patch-1
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ cat > editedfile << '__EOF__'
   > This line has changed
   > This change will be committed
@@ -1378,27 +1555,26 @@
   > e
   > EOF
   diff --git a/editedfile b/editedfile
-  1 hunks, 2 lines changed
+  new file mode 100644
   examine changes to 'editedfile'?
   (enter ? for help) [Ynesfdaq?] y
   
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This is the second line
+  @@ -0,0 +1,3 @@
   +This line has changed
   +This change will be committed
-   This is the third line
+  +This is the third line
   record this change to 'editedfile'?
   (enter ? for help) [Ynesfdaq?] e
   
+  abort: error parsing patch: unhandled transition: hunk -> other
+  [10]
   $ cat editedfile
   This line has changed
   This change will be committed
   This is the third line
   $ hg cat -r tip editedfile
-  This is the first line
-  This change will be committed
-  This is the third line
+  editedfile: no such file in rev c023c56f4aa3
+  [1]
   $ hg revert editedfile
 
 Trying to edit patch for whole file
@@ -1408,18 +1584,10 @@
   > e
   > q
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 1 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
-  cannot edit patch for whole file
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] q
-  
-  abort: user quit
-  [250]
+  no changes to record
+  [1]
   $ hg revert editedfile
+  file not managed: editedfile
 
 Removing changes from patch
 
@@ -1434,32 +1602,18 @@
   > y
   > e
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 3 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This change will be committed
-  -This is the third line
-  +This change will not be committed
-  +This is the second line
-  +This line has been added
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
   no changes to record
   [1]
   $ cat editedfile
   This change will not be committed
   This is the second line
+  This is the fourth line
   This line has been added
   $ hg cat -r tip editedfile
-  This is the first line
-  This change will be committed
-  This is the third line
+  editedfile: no such file in rev c023c56f4aa3
+  [1]
   $ hg revert editedfile
+  file not managed: editedfile
 
 Invalid patch
 
@@ -1474,44 +1628,19 @@
   > y
   > e
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 3 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This change will be committed
-  -This is the third line
-  +This change will not be committed
-  +This is the second line
-  +This line has been added
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
-  patching file editedfile
-  Hunk #1 FAILED at 0
-  1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
-  abort: patch failed to apply
-  [20]
+  no changes to record
+  [1]
   $ cat editedfile
-  This change will not be committed
   This is the second line
+  This is the fourth line
+  This line has been added
   This line has been added
   $ hg cat -r tip editedfile
-  This is the first line
-  This change will be committed
-  This is the third line
+  editedfile: no such file in rev c023c56f4aa3
+  [1]
   $ cat editedfile.rej
-  --- editedfile
-  +++ editedfile
-  @@ -1,3 +1,3 @@
-  -That is the first line
-  -That change will be committed
-  -That is the third line
-  +That change will not be committed
-  +That is the second line
-  +That line has been added
+  cat: editedfile.rej: $ENOENT$
+  [1]
 
 Malformed patch - error handling
 
@@ -1523,23 +1652,8 @@
   > y
   > e
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 3 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This change will be committed
-  -This is the third line
-  +This change will not be committed
-  +This is the second line
-  +This line has been added
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
-  abort: error parsing patch: unhandled transition: range -> range
-  [10]
+  no changes to record
+  [1]
 
 Exiting editor with status 1, ignores the edit but does not stop the recording
 session
@@ -1549,25 +1663,6 @@
   > e
   > n
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 3 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This change will be committed
-  -This is the third line
-  +This change will not be committed
-  +This is the second line
-  +This line has been added
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
-  editor exited with exit code 1
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] n
-  
   no changes to record
   [1]
 
@@ -1583,26 +1678,11 @@
   > y
   > e
   > EOF
-  diff --git a/editedfile b/editedfile
-  1 hunks, 3 lines changed
-  examine changes to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,3 +1,3 @@
-  -This is the first line
-  -This change will be committed
-  -This is the third line
-  +This change will not be committed
-  +This is the second line
-  +This line has been added
-  record this change to 'editedfile'?
-  (enter ? for help) [Ynesfdaq?] e
-  
-  abort: error parsing patch: unhandled transition: file -> other
-  [10]
+  no changes to record
+  [1]
 
   $ hg up -C
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 With win32text
 
@@ -1625,37 +1705,27 @@
   > y
   > y
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -3,3 +3,4 @@ a
-   a
-   b
-   c
-  +d
-  record this change to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  no changes to record
+  [1]
 
   $ hg status -A subdir/f1
-  C subdir/f1
+  ? subdir/f1
   $ hg tip -p
-  changeset:   30:* (glob)
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:24 1970 +0000
-  summary:     w1
-  
-  diff -r ???????????? -r ???????????? subdir/f1 (glob)
-  --- a/subdir/f1	Thu Jan 01 00:00:23 1970 +0000
-  +++ b/subdir/f1	Thu Jan 01 00:00:24 1970 +0000
-  @@ -3,3 +3,4 @@
-   a
-   b
-   c
-  +d
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
 
 
@@ -1666,23 +1736,12 @@
   > y
   > y
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  1 hunks, 1 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -4,3 +4,4 @@ a
-   b
-   c
-   d
-  +e
-  record this change to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
+  no changes to record
+  [1]
   $ hg status -A subdir/f1
-  C subdir/f1
+  ? subdir/f1
   $ hg log --template '{author}\n' -l 1
-  xyz
+  test
   $ HGUSER="test"
   $ export HGUSER
 
@@ -1704,61 +1763,120 @@
   examine changes to 'plain' and 'plain3'?
   (enter ? for help) [Ynesfdaq?] y
   
-  @@ -11,3 +11,4 @@ 8
-   9
-   10
-   11
-  +somechange
+  @@ -9,4 +9,4 @@ 8
+   9
+   10
+   11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54somechange
   record this change to 'plain3'?
   (enter ? for help) [Ynesfdaq?] y
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Rename file but discard edits
 
   $ echo content > new-file
   $ hg add -q new-file
   $ hg commit -qm 'new file'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg mv new-file renamed-file
+  new-file has not been committed yet, so no copy data will be stored for renamed-file.
   $ echo new-content >> renamed-file
   $ hg commit -i -d '24 0' -m content-rename<<EOF
   > y
   > n
   > EOF
-  diff --git a/new-file b/renamed-file
-  rename from new-file
-  rename to renamed-file
+  diff --git a/plain b/plain3
+  rename from plain
+  rename to plain3
   1 hunks, 1 lines changed
-  examine changes to 'new-file' and 'renamed-file'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,1 +1,2 @@
-   content
-  +new-content
-  record this change to 'renamed-file'?
+  examine changes to 'plain' and 'plain3'?
+  (enter ? for help) [Ynesfdaq?] y
+  
+  @@ -9,4 +9,4 @@ 8
+   9
+   10
+   11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54somechange
+  record change 1/2 to 'plain3'?
   (enter ? for help) [Ynesfdaq?] n
   
+  diff --git a/renamed-file b/renamed-file
+  new file mode 100644
+  examine changes to 'renamed-file'?
+  (enter ? for help) [Ynesfdaq?] abort: response expected
+  [255]
   $ hg status
-  M renamed-file
-  ? editedfile.orig
-  ? editedfile.rej
+  A plain3
+  A renamed-file
+  R plain
+  ? editedfile
   ? editor.sh
+  ? f1.py
+  ? iwillmergethat
+  ? plain2
+  ? subdir/a
+  ? subdir/f1
+  ? subdir/f2
   $ hg diff
+  diff -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:09 1970 +0000
+  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  @@ -1,12 +0,0 @@
+  -1
+  -2
+  -3
+  -4
+  -5
+  -6
+  -7
+  -8
+  -9
+  -10
+  -11
+  -7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
+  diff -r c023c56f4aa3 plain3
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/plain3	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,12 @@
+  +1
+  +2
+  +3
+  +4
+  +5
+  +6
+  +7
+  +8
+  +9
+  +10
+  +11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54somechange
   diff -r * renamed-file (glob)
-  --- a/renamed-file	Thu Jan 01 00:00:24 1970 +0000
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/renamed-file	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +1,2 @@
-   content
+  @@ -0,0 +1,2 @@
+  +content
   +new-content
 
 The #if execbit block above changes the hash here on some systems
   $ hg status -A plain3
-  C plain3
+  A plain3
+    plain
   $ hg tip
-  changeset:   34:* (glob)
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:24 1970 +0000
-  summary:     content-rename
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
   
 Editing patch of newly added file
 
@@ -1790,10 +1908,12 @@
   record this change to 'newfile'?
   (enter ? for help) [Ynesfdaq?] e
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg cat -r tip newfile
-  This is the very line
-  This is the second line
-  This is the third line
+  newfile: no such file in rev c023c56f4aa3
+  [1]
 
   $ cat newfile
   This is the first line
@@ -1802,7 +1922,7 @@
 
 Add new file from within a subdirectory
   $ hg update -C .
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkdir folder
   $ cd folder
   $ echo "foo" > bar
@@ -1821,24 +1941,31 @@
   record this change to 'folder/bar'?
   (enter ? for help) [Ynesfdaq?] y
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 The #if execbit block above changes the hashes here on some systems
   $ hg tip -p
-  changeset:   36:* (glob)
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:26 1970 +0000
-  summary:     newfilesubdir
-  
-  diff -r * -r * folder/bar (glob)
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/folder/bar	Thu Jan 01 00:00:26 1970 +0000
-  @@ -0,0 +1,1 @@
-  +foo
+  changeset:   9:c023c56f4aa3
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:09 1970 +0000
+  summary:     noeol
+  
+  diff -r 7264f99c5f5f -r c023c56f4aa3 plain
+  --- a/plain	Thu Jan 01 00:00:08 1970 +0000
+  +++ b/plain	Thu Jan 01 00:00:09 1970 +0000
+  @@ -9,3 +9,4 @@
+   9
+   10
+   11
+  +7264f99c5f5ff3261504828afa4fb4d406c3af54
+  \ No newline at end of file
   
   $ cd ..
 
   $ hg status -A folder/bar
-  C folder/bar
+  A folder/bar
 
 Clear win32text configuration before size/timestamp sensitive test
 
@@ -1869,19 +1996,6 @@
   > E
   > EOF
   $ hg diff --git subdir/f1
-  diff --git a/subdir/f1 b/subdir/f1
-  --- a/subdir/f1
-  +++ b/subdir/f1
-  @@ -1,7 +1,7 @@
-  -a
-  +A
-   a
-   a
-   b
-   c
-   d
-  -e
-  +E
 
   $ touch -t 200001010000 subdir/f1
 
@@ -1898,42 +2012,17 @@
   > y
   > n
   > EOF
-  diff --git a/subdir/f1 b/subdir/f1
-  2 hunks, 2 lines changed
-  examine changes to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -1,6 +1,6 @@
-  -a
-  +A
-   a
-   a
-   b
-   c
-   d
-  record change 1/2 to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] y
-  
-  @@ -2,6 +2,6 @@
-   a
-   a
-   b
-   c
-   d
-  -e
-  +E
-  record change 2/2 to 'subdir/f1'?
-  (enter ? for help) [Ynesfdaq?] n
-  
+  no changes to record
+  [1]
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > fakepatchtime = !
   > EOF
 
   $ hg debugstate | grep ' subdir/f1$'
-  n   0         -1 unset               subdir/f1
+  [1]
   $ hg status -A subdir/f1
-  M subdir/f1
+  ? subdir/f1
 
 Test commands.commit.interactive.unified=0
 
# Timout reached for process 1068864 

ERROR: test-commit-interactive.t output changed
!# Ret was: 0 (test-commit-interactive.t) 
test-merge-changedelete.t#newfilenode
test-merge-changedelete.t#newfilenode ... # Test test-merge-changedelete.t#newfilenode 
# Running sh "/tmp/hgtests.qiewis6n/child132/test-merge-changedelete.t-newfilenode.sh" 
# Ret was: 0 (test-branches.t#nommap#v2) 
ok
test-merge-changedelete.t#old
test-merge-changedelete.t#old ... # Test test-merge-changedelete.t#old 
# Timout reached for process 1068618 
# Running sh "/tmp/hgtests.qiewis6n/child133/test-merge-changedelete.t-old.sh" 
# Ret was: 0 (test-branches.t#nommap#v3) 
ok
test-hook.t
test-hook.t ... # Test test-hook.t 
# Timout reached for process 1068759 
# Running sh "/tmp/hgtests.qiewis6n/child134/test-hook.t.sh" 
# Timout reached for process 1068809 
# Ret was: 0 (test-lfs.t) 
ok
test-bookmarks-push-race.t
test-bookmarks-push-race.t ... # Test test-bookmarks-push-race.t 
# Running sh "/tmp/hgtests.qiewis6n/child135/test-bookmarks-push-race.t.sh" 
# Ret was: 0 (test-bookmarks-push-race.t) 
ok
test-grep.t
test-grep.t ... # Test test-grep.t 
# Timout reached for process 1070231 
# Running sh "/tmp/hgtests.qiewis6n/child136/test-grep.t.sh" 
# Timout reached for process 1069785 
# Ret was: 0 (test-hook.t) 
ok
test-ssh-proto.t
test-ssh-proto.t ... # Test test-ssh-proto.t 
# Running sh "/tmp/hgtests.qiewis6n/child137/test-ssh-proto.t.sh" 
# Timout reached for process 1069613 
# Ret was: 0 (test-merge-changedelete.t#newfilenode) 
ok
test-highlight.t
test-highlight.t ... # Test test-highlight.t 
# Running sh "/tmp/hgtests.qiewis6n/child138/test-highlight.t.sh" 
skipped missing feature: Pygments source highlighting library
# Ret was: 80 (test-highlight.t) 
test-shelve.t#phasebased#dirstate-v1
test-shelve.t#phasebased#dirstate-v1 ... # Test test-shelve.t#phasebased#dirstate-v1 
# Timout reached for process 1071287 
# Ret was: 0 (test-merge-changedelete.t#old) 
ok
test-shelve.t#phasebased#dirstate-v2
test-shelve.t#phasebased#dirstate-v2 ... # Test test-shelve.t#phasebased#dirstate-v2 
# Timout reached for process 1069633 
# Running sh "/tmp/hgtests.qiewis6n/child139/test-shelve.t-phasebased-dirstate-v1.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child140/test-shelve.t-phasebased-dirstate-v2.sh" 
# Ret was: 0 (test-ssh-proto.t) 
ok
test-shelve.t#stripbased#dirstate-v1
test-shelve.t#stripbased#dirstate-v1 ... # Test test-shelve.t#stripbased#dirstate-v1 
# Timout reached for process 1071040 
# Running sh "/tmp/hgtests.qiewis6n/child141/test-shelve.t-stripbased-dirstate-v1.sh" 

--- /<<PKGBUILDDIR>>/tests/test-grep.t
+++ /<<PKGBUILDDIR>>/tests/test-grep.t.err
@@ -885,6 +885,8 @@
   > echo data1 >> $f
   > done
   $ hg ci -qAm1
+  Bus error
+  [135]
 
   $ hg update -q 0
   $ hg cp add0 add0-cp2
@@ -894,15 +896,25 @@
   > echo data2 >> $f
   > done
   $ hg ci -qAm2
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg update -q 1
+  abort: unknown revision '1'
+  [10]
   $ hg cp add0-cp1 add0-cp1-cp3
   $ hg cp add0-cp1-mod1 add0-cp1-mod1-cp3-mod3
   $ hg rm add0-cp1-mod1-rm3
+  not removing add0-cp1-mod1-rm3: file has been marked for add (use 'hg forget' to undo add)
+  [1]
   $ for f in *mod3*; do
   > echo data3 >> $f
   > done
   $ hg ci -qAm3
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg cp add0 add0-cp4
   $ hg cp add0 add0-cp4-mod4
@@ -912,30 +924,17 @@
   > done
 
   $ hg log -Gr':wdir()'
-  o  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
+  o  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   |
-  @  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  |
-  | o  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  | |
-  o |  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
-  |/
-  o  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  @  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
   
 
 follow revision history from wdir parent:
 
   $ hg log -f
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -f data
-  add0-cp1-mod1-cp3-mod3:3:+:data3
-  add0-mod3:3:+:data3
-  add0-cp1-mod1:1:+:data1
-  add0-cp1-mod1-rm3:1:+:data1
-  add0-mod1:1:+:data1
   add0:0:+:data0
   add0-mod1:0:+:data0
   add0-mod2:0:+:data0
@@ -946,35 +945,6 @@
   add0-rm4:0:+:data0
 
   $ hg grep -f data
-  add0:3:data0
-  add0-cp1:3:data0
-  add0-cp1-cp3:3:data0
-  add0-cp1-mod1:3:data0
-  add0-cp1-mod1:3:data1
-  add0-cp1-mod1-cp3-mod3:3:data0
-  add0-cp1-mod1-cp3-mod3:3:data1
-  add0-cp1-mod1-cp3-mod3:3:data3
-  add0-mod1:3:data0
-  add0-mod1:3:data1
-  add0-mod2:3:data0
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-mod4:3:data0
-  add0-rm2:3:data0
-  add0-rm4:3:data0
-  add0:1:data0
-  add0-cp1:1:data0
-  add0-cp1-mod1:1:data0
-  add0-cp1-mod1:1:data1
-  add0-cp1-mod1-rm3:1:data0
-  add0-cp1-mod1-rm3:1:data1
-  add0-mod1:1:data0
-  add0-mod1:1:data1
-  add0-mod2:1:data0
-  add0-mod3:1:data0
-  add0-mod4:1:data0
-  add0-rm2:1:data0
-  add0-rm4:1:data0
   add0:0:data0
   add0-mod1:0:data0
   add0-mod2:0:data0
@@ -987,55 +957,36 @@
 follow revision history from specified revision:
 
   $ hg log -fr2
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data
-  add0-cp2-mod2:2:+:data2
-  add0-mod2:2:+:data2
-  add0:0:+:data0
-  add0-mod1:0:+:data0
-  add0-mod2:0:+:data0
-  add0-mod3:0:+:data0
-  add0-mod4:0:+:data0
-  add0-rm1:0:+:data0
-  add0-rm2:0:+:data0
-  add0-rm4:0:+:data0
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep -fr2 data
-  add0:2:data0
-  add0-cp2:2:data0
-  add0-cp2-mod2:2:data0
-  add0-cp2-mod2:2:data2
-  add0-mod1:2:data0
-  add0-mod2:2:data0
-  add0-mod2:2:data2
-  add0-mod3:2:data0
-  add0-mod4:2:data0
-  add0-rm1:2:data0
-  add0-rm4:2:data0
-  add0:0:data0
-  add0-mod1:0:data0
-  add0-mod2:0:data0
-  add0-mod3:0:data0
-  add0-mod4:0:data0
-  add0-rm1:0:data0
-  add0-rm2:0:data0
-  add0-rm4:0:data0
+  abort: unknown revision '2'
+  [10]
 
 follow revision history from wdir:
 
   $ hg log -fr'wdir()'
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
  BROKEN: should not abort because of removed file
   $ hg grep --diff -fr'wdir()' data
+  add0-cp1-mod1:2147483647:+:data1
+  add0-cp1-mod1-cp3-mod3:2147483647:+:data1
+  add0-cp1-mod1-cp3-mod3:2147483647:+:data3
+  add0-cp1-mod1-rm3:2147483647:+:data1
+  add0-cp2-mod2:2147483647:+:data2
   add0-cp4-mod4:2147483647:+:data4
+  add0-mod1:2147483647:+:data1
+  add0-mod2:2147483647:+:data2
+  add0-mod3:2147483647:+:data3
   add0-mod4:2147483647:+:data4
-  add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest
+  add0-rm1:2147483647:-:abort: add0-rm1@None: not found in manifest
   [50]
 
   $ hg grep -fr'wdir()' data
@@ -1047,46 +998,22 @@
   add0-cp1-mod1-cp3-mod3:2147483647:data0
   add0-cp1-mod1-cp3-mod3:2147483647:data1
   add0-cp1-mod1-cp3-mod3:2147483647:data3
+  add0-cp1-mod1-rm3:2147483647:data0
+  add0-cp1-mod1-rm3:2147483647:data1
+  add0-cp2:2147483647:data0
+  add0-cp2-mod2:2147483647:data0
+  add0-cp2-mod2:2147483647:data2
   add0-cp4:2147483647:data0
   add0-cp4-mod4:2147483647:data0
   add0-cp4-mod4:2147483647:data4
   add0-mod1:2147483647:data0
   add0-mod1:2147483647:data1
   add0-mod2:2147483647:data0
+  add0-mod2:2147483647:data2
   add0-mod3:2147483647:data0
   add0-mod3:2147483647:data3
   add0-mod4:2147483647:data0
   add0-mod4:2147483647:data4
-  add0-rm2:2147483647:data0
-  add0:3:data0
-  add0-cp1:3:data0
-  add0-cp1-cp3:3:data0
-  add0-cp1-mod1:3:data0
-  add0-cp1-mod1:3:data1
-  add0-cp1-mod1-cp3-mod3:3:data0
-  add0-cp1-mod1-cp3-mod3:3:data1
-  add0-cp1-mod1-cp3-mod3:3:data3
-  add0-mod1:3:data0
-  add0-mod1:3:data1
-  add0-mod2:3:data0
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-mod4:3:data0
-  add0-rm2:3:data0
-  add0-rm4:3:data0
-  add0:1:data0
-  add0-cp1:1:data0
-  add0-cp1-mod1:1:data0
-  add0-cp1-mod1:1:data1
-  add0-cp1-mod1-rm3:1:data0
-  add0-cp1-mod1-rm3:1:data1
-  add0-mod1:1:data0
-  add0-mod1:1:data1
-  add0-mod2:1:data0
-  add0-mod3:1:data0
-  add0-mod4:1:data0
-  add0-rm2:1:data0
-  add0-rm4:1:data0
   add0:0:data0
   add0-mod1:0:data0
   add0-mod2:0:data0
@@ -1099,73 +1026,26 @@
 follow revision history from multiple revisions:
 
   $ hg log -fr'1+2'
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
+  abort: unknown revision '1'
+  [10]
+
+  $ hg grep --diff -fr'1+2' data
+  abort: unknown revision '1'
+  [10]
+
+  $ hg grep -fr'1+2' data
+  abort: unknown revision '1'
+  [10]
+
+follow file history from wdir parent, unmodified in wdir:
+
+  $ hg log -f add0-mod3
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
-  $ hg grep --diff -fr'1+2' data
-  add0-cp2-mod2:2:+:data2
-  add0-mod2:2:+:data2
-  add0-cp1-mod1:1:+:data1
-  add0-cp1-mod1-rm3:1:+:data1
-  add0-mod1:1:+:data1
-  add0:0:+:data0
-  add0-mod1:0:+:data0
-  add0-mod2:0:+:data0
+  $ hg grep --diff -f data add0-mod3
   add0-mod3:0:+:data0
-  add0-mod4:0:+:data0
-  add0-rm1:0:+:data0
-  add0-rm2:0:+:data0
-  add0-rm4:0:+:data0
-
-  $ hg grep -fr'1+2' data
-  add0:2:data0
-  add0-cp2:2:data0
-  add0-cp2-mod2:2:data0
-  add0-cp2-mod2:2:data2
-  add0-mod1:2:data0
-  add0-mod2:2:data0
-  add0-mod2:2:data2
-  add0-mod3:2:data0
-  add0-mod4:2:data0
-  add0-rm1:2:data0
-  add0-rm4:2:data0
-  add0:1:data0
-  add0-cp1:1:data0
-  add0-cp1-mod1:1:data0
-  add0-cp1-mod1:1:data1
-  add0-cp1-mod1-rm3:1:data0
-  add0-cp1-mod1-rm3:1:data1
-  add0-mod1:1:data0
-  add0-mod1:1:data1
-  add0-mod2:1:data0
-  add0-mod3:1:data0
-  add0-mod4:1:data0
-  add0-rm2:1:data0
-  add0-rm4:1:data0
-  add0:0:data0
-  add0-mod1:0:data0
-  add0-mod2:0:data0
-  add0-mod3:0:data0
-  add0-mod4:0:data0
-  add0-rm1:0:data0
-  add0-rm2:0:data0
-  add0-rm4:0:data0
-
-follow file history from wdir parent, unmodified in wdir:
-
-  $ hg log -f add0-mod3
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
-
-  $ hg grep --diff -f data add0-mod3
-  add0-mod3:3:+:data3
-  add0-mod3:0:+:data0
 
   $ hg grep -f data add0-mod3
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-mod3:1:data0
   add0-mod3:0:data0
 
 follow file history from wdir parent, modified in wdir:
@@ -1177,41 +1057,35 @@
   add0-mod4:0:+:data0
 
   $ hg grep -f data add0-mod4
-  add0-mod4:3:data0
-  add0-mod4:1:data0
   add0-mod4:0:data0
 
 follow file history from wdir parent, copied but unmodified:
 
   $ hg log -f add0-cp1-cp3
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: cannot follow nonexistent file: "add0-cp1-cp3"
+  [20]
 
   $ hg grep --diff -f data add0-cp1-cp3
-  add0:0:+:data0
+  abort: cannot follow nonexistent file: "add0-cp1-cp3"
+  [20]
 
  BROKEN: should follow history across renames
   $ hg grep -f data add0-cp1-cp3
-  add0-cp1-cp3:3:data0
+  [1]
 
 follow file history from wdir parent, copied and modified:
 
   $ hg log -f add0-cp1-mod1-cp3-mod3
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: cannot follow nonexistent file: "add0-cp1-mod1-cp3-mod3"
+  [20]
 
   $ hg grep --diff -f data add0-cp1-mod1-cp3-mod3
-  add0-cp1-mod1-cp3-mod3:3:+:data3
-  add0-cp1-mod1:1:+:data1
-  add0:0:+:data0
+  abort: cannot follow nonexistent file: "add0-cp1-mod1-cp3-mod3"
+  [20]
 
  BROKEN: should follow history across renames
   $ hg grep -f data add0-cp1-mod1-cp3-mod3
-  add0-cp1-mod1-cp3-mod3:3:data0
-  add0-cp1-mod1-cp3-mod3:3:data1
-  add0-cp1-mod1-cp3-mod3:3:data3
+  [1]
 
 follow file history from wdir parent, copied in wdir:
 
@@ -1230,17 +1104,15 @@
 follow file history from wdir parent, removed:
 
   $ hg log -f add0-cp1-mod1-rm3
-  abort: cannot follow file not in parent revision: "add0-cp1-mod1-rm3"
-  [20]
+  add0-cp1-mod1-rm3: no such file in rev 441bd4522840
 
   $ hg grep --diff -f data add0-cp1-mod1-rm3
-  abort: cannot follow file not in parent revision: "add0-cp1-mod1-rm3"
-  [20]
+  add0-cp1-mod1-rm3: no such file in rev 441bd4522840
+  [1]
 
  BROKEN: maybe better to abort
   $ hg grep -f data add0-cp1-mod1-rm3
-  add0-cp1-mod1-rm3:1:data0
-  add0-cp1-mod1-rm3:1:data1
+  [1]
 
 follow file history from wdir parent (explicit), removed:
 
@@ -1254,8 +1126,7 @@
 
  BROKEN: should abort
   $ hg grep -fr. data add0-cp1-mod1-rm3
-  add0-cp1-mod1-rm3:1:data0
-  add0-cp1-mod1-rm3:1:data1
+  [1]
 
 follow file history from wdir parent, removed in wdir:
 
@@ -1269,8 +1140,6 @@
 
  BROKEN: should abort
   $ hg grep -f data add0-rm4
-  add0-rm4:3:data0
-  add0-rm4:1:data0
   add0-rm4:0:data0
 
 follow file history from wdir parent (explicit), removed in wdir:
@@ -1282,132 +1151,115 @@
   add0-rm4:0:+:data0
 
   $ hg grep -fr. data add0-rm4
-  add0-rm4:3:data0
-  add0-rm4:1:data0
   add0-rm4:0:data0
 
 follow file history from wdir parent, multiple files:
 
   $ hg log -f add0-mod3 add0-cp1-mod1
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
-  1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
+  add0-cp1-mod1: no such file in rev 441bd4522840
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -f data add0-mod3 add0-cp1-mod1
-  add0-mod3:3:+:data3
-  add0-cp1-mod1:1:+:data1
-  add0:0:+:data0
+  add0-cp1-mod1: no such file in rev 441bd4522840
   add0-mod3:0:+:data0
 
  BROKEN: should follow history across renames
   $ hg grep -f data add0-mod3 add0-cp1-mod1
-  add0-cp1-mod1:3:data0
-  add0-cp1-mod1:3:data1
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-cp1-mod1:1:data0
-  add0-cp1-mod1:1:data1
-  add0-mod3:1:data0
   add0-mod3:0:data0
 
 follow file history from specified revision, modified:
 
   $ hg log -fr2 add0-mod2
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data add0-mod2
-  add0-mod2:2:+:data2
-  add0-mod2:0:+:data0
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep -fr2 data add0-mod2
-  add0-mod2:2:data0
-  add0-mod2:2:data2
-  add0-mod2:0:data0
+  abort: unknown revision '2'
+  [10]
 
 follow file history from specified revision, copied but unmodified:
 
   $ hg log -fr2 add0-cp2
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data add0-cp2
-  add0:0:+:data0
+  abort: unknown revision '2'
+  [10]
 
  BROKEN: should follow history across renames
   $ hg grep -fr2 data add0-cp2
-  add0-cp2:2:data0
+  abort: unknown revision '2'
+  [10]
 
 follow file history from specified revision, copied and modified:
 
   $ hg log -fr2 add0-cp2-mod2
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data add0-cp2-mod2
-  add0-cp2-mod2:2:+:data2
-  add0:0:+:data0
+  abort: unknown revision '2'
+  [10]
 
  BROKEN: should follow history across renames
   $ hg grep -fr2 data add0-cp2-mod2
-  add0-cp2-mod2:2:data0
-  add0-cp2-mod2:2:data2
+  abort: unknown revision '2'
+  [10]
 
 follow file history from specified revision, removed:
 
   $ hg log -fr2 add0-rm2
-  abort: cannot follow file not in any of the specified revisions: "add0-rm2"
-  [20]
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data add0-rm2
-  abort: cannot follow file not in any of the specified revisions: "add0-rm2"
-  [20]
+  abort: unknown revision '2'
+  [10]
 
  BROKEN: should abort
   $ hg grep -fr2 data add0-rm2
-  add0-rm2:0:data0
+  abort: unknown revision '2'
+  [10]
 
 follow file history from specified revision, multiple files:
 
   $ hg log -fr2 add0-cp2 add0-mod2
-  2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
-  0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
+  abort: unknown revision '2'
+  [10]
 
   $ hg grep --diff -fr2 data add0-cp2 add0-mod2
-  add0-mod2:2:+:data2
-  add0:0:+:data0
-  add0-mod2:0:+:data0
+  abort: unknown revision '2'
+  [10]
 
  BROKEN: should follow history across renames
   $ hg grep -fr2 data add0-cp2 add0-mod2
-  add0-cp2:2:data0
-  add0-mod2:2:data0
-  add0-mod2:2:data2
-  add0-mod2:0:data0
+  abort: unknown revision '2'
+  [10]
 
 follow file history from wdir, unmodified:
 
   $ hg log -fr'wdir()' add0-mod3
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -fr'wdir()' data add0-mod3
-  add0-mod3:3:+:data3
+  add0-mod3:2147483647:+:data3
   add0-mod3:0:+:data0
 
   $ hg grep -fr'wdir()' data add0-mod3
   add0-mod3:2147483647:data0
   add0-mod3:2147483647:data3
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-mod3:1:data0
   add0-mod3:0:data0
 
 follow file history from wdir, modified:
 
   $ hg log -fr'wdir()' add0-mod4
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -fr'wdir()' data add0-mod4
@@ -1417,14 +1269,12 @@
   $ hg grep -fr'wdir()' data add0-mod4
   add0-mod4:2147483647:data0
   add0-mod4:2147483647:data4
-  add0-mod4:3:data0
-  add0-mod4:1:data0
   add0-mod4:0:data0
 
 follow file history from wdir, copied but unmodified:
 
   $ hg log -fr'wdir()' add0-cp4
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -fr'wdir()' data add0-cp4
@@ -1437,7 +1287,7 @@
 follow file history from wdir, copied and modified:
 
   $ hg log -fr'wdir()' add0-cp4-mod4
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -fr'wdir()' data add0-cp4-mod4
@@ -1452,13 +1302,12 @@
 follow file history from wdir, multiple files:
 
   $ hg log -fr'wdir()' add0-cp4 add0-mod4 add0-mod3
-  2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
-  3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
+  2147483647: A add0-cp1, A add0-cp1-cp3, A add0-cp1-mod1, A add0-cp1-mod1-cp3-mod3, A add0-cp1-mod1-rm3, A add0-cp2, A add0-cp2-mod2, A add0-cp4, A add0-cp4-mod4, M add0-mod1, M add0-mod2, M add0-mod3, M add0-mod4, R add0-rm1, R add0-rm2, R add0-rm4
   0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
 
   $ hg grep --diff -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3
+  add0-mod3:2147483647:+:data3
   add0-mod4:2147483647:+:data4
-  add0-mod3:3:+:data3
   add0:0:+:data0
   add0-mod3:0:+:data0
   add0-mod4:0:+:data0
@@ -1470,11 +1319,6 @@
   add0-mod3:2147483647:data3
   add0-mod4:2147483647:data0
   add0-mod4:2147483647:data4
-  add0-mod3:3:data0
-  add0-mod3:3:data3
-  add0-mod4:3:data0
-  add0-mod3:1:data0
-  add0-mod4:1:data0
   add0-mod3:0:data0
   add0-mod4:0:data0
 

ERROR: test-grep.t output changed
!# Ret was: 0 (test-grep.t) 
test-shelve.t#stripbased#dirstate-v2
test-shelve.t#stripbased#dirstate-v2 ... # Timout reached for process 1070542 
# Test test-shelve.t#stripbased#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child142/test-shelve.t-stripbased-dirstate-v2.sh" 
# Ret was: 0 (test-shelve.t#phasebased#dirstate-v1) 
ok
test-lfs-test-server.t#git-server
test-lfs-test-server.t#git-server ... # Test test-lfs-test-server.t#git-server 
# Timout reached for process 1071317 
# Running sh "/tmp/hgtests.qiewis6n/child143/test-lfs-test-server.t-git-server.sh" 
skipped missing feature: git-lfs test server
# Ret was: 80 (test-lfs-test-server.t#git-server) 
test-lfs-test-server.t#hg-server
test-lfs-test-server.t#hg-server ... # Test test-lfs-test-server.t#hg-server 
# Timout reached for process 1072735 
# Running sh "/tmp/hgtests.qiewis6n/child144/test-lfs-test-server.t-hg-server.sh" 
# Timout reached for process 1071341 
# Ret was: 0 (test-shelve.t#phasebased#dirstate-v2) 
ok
test-convert-git.t
test-convert-git.t ... # Test test-convert-git.t 
# Running sh "/tmp/hgtests.qiewis6n/child145/test-convert-git.t.sh" 
skipped missing feature: git command line client
# Ret was: 80 (test-convert-git.t) 
test-http-permissions.t
test-http-permissions.t ... # Test test-http-permissions.t 
# Running sh "/tmp/hgtests.qiewis6n/child146/test-http-permissions.t.sh" 
# Timout reached for process 1072773 
# Timout reached for process 1072760 
# Ret was: 0 (test-lfs-test-server.t#hg-server) 
ok
test-phabricator.t
test-phabricator.t ... # Test test-phabricator.t 
# Running sh "/tmp/hgtests.qiewis6n/child147/test-phabricator.t.sh" 
skipped missing feature: vcr http mocking library (pytest-vcr)
# Ret was: 80 (test-phabricator.t) 
test-check-cargo-lock.t
test-check-cargo-lock.t ... # Test test-check-cargo-lock.t 
# Timout reached for process 1073126 
# Running sh "/tmp/hgtests.qiewis6n/child148/test-check-cargo-lock.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-cargo-lock.t) 
test-bookmarks.t
test-bookmarks.t ... # Test test-bookmarks.t 
# Running sh "/tmp/hgtests.qiewis6n/child149/test-bookmarks.t.sh" 
# Timout reached for process 1073135 
# Timout reached for process 1071659 
# Ret was: 0 (test-shelve.t#stripbased#dirstate-v1) 
ok
test-merge-force.t
test-merge-force.t ... # Test test-merge-force.t 
# Running sh "/tmp/hgtests.qiewis6n/child150/test-merge-force.t.sh" 
# Ret was: 0 (test-shelve.t#stripbased#dirstate-v2) 
ok
test-revset2.t
test-revset2.t ... # Timout reached for process 1071829 
# Test test-revset2.t 
# Running sh "/tmp/hgtests.qiewis6n/child151/test-revset2.t.sh" 
# Ret was: 0 (test-http-permissions.t) 
ok
test-clone.t
test-clone.t ... # Test test-clone.t 
# Timout reached for process 1072777 
# Running sh "/tmp/hgtests.qiewis6n/child152/test-clone.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-merge-force.t
+++ /<<PKGBUILDDIR>>/tests/test-merge-force.t.err
@@ -13,12 +13,17 @@
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 1
   $ hg addremove -q --similarity 0
   $ hg commit -qm 'base'
+  Bus error
+  [135]
 
 Create remote changeset
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 2
   $ hg addremove -q --similarity 0
   $ hg commit -qm 'remote'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Create local changeset
 
@@ -26,6 +31,9 @@
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 3
   $ hg addremove -q --similarity 0
   $ hg commit -qm 'local'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Set up working directory
 
@@ -35,70 +43,43 @@
   $ rm *_*_*_missing-*
 
   $ hg status -A
-  M content1_content1_content1_content4-tracked
-  M content1_content1_content3_content1-tracked
-  M content1_content1_content3_content4-tracked
-  M content1_content2_content1_content2-tracked
-  M content1_content2_content1_content4-tracked
-  M content1_content2_content2_content1-tracked
-  M content1_content2_content2_content4-tracked
-  M content1_content2_content3_content1-tracked
-  M content1_content2_content3_content2-tracked
-  M content1_content2_content3_content4-tracked
-  M content1_missing_content1_content4-tracked
-  M content1_missing_content3_content1-tracked
-  M content1_missing_content3_content4-tracked
-  M missing_content2_content2_content4-tracked
-  M missing_content2_content3_content2-tracked
-  M missing_content2_content3_content4-tracked
-  M missing_missing_content3_content4-tracked
+  A content1_content1_content1_content1-tracked
+  A content1_content1_content1_content4-tracked
+  A content1_content1_content3_content1-tracked
+  A content1_content1_content3_content3-tracked
+  A content1_content1_content3_content4-tracked
   A content1_content1_missing_content1-tracked
   A content1_content1_missing_content4-tracked
+  A content1_content2_content1_content1-tracked
+  A content1_content2_content1_content2-tracked
+  A content1_content2_content1_content4-tracked
+  A content1_content2_content2_content1-tracked
+  A content1_content2_content2_content2-tracked
+  A content1_content2_content2_content4-tracked
+  A content1_content2_content3_content1-tracked
+  A content1_content2_content3_content2-tracked
+  A content1_content2_content3_content3-tracked
+  A content1_content2_content3_content4-tracked
   A content1_content2_missing_content1-tracked
   A content1_content2_missing_content2-tracked
   A content1_content2_missing_content4-tracked
+  A content1_missing_content1_content1-tracked
+  A content1_missing_content1_content4-tracked
+  A content1_missing_content3_content1-tracked
+  A content1_missing_content3_content3-tracked
+  A content1_missing_content3_content4-tracked
   A content1_missing_missing_content1-tracked
   A content1_missing_missing_content4-tracked
+  A missing_content2_content2_content2-tracked
+  A missing_content2_content2_content4-tracked
+  A missing_content2_content3_content2-tracked
+  A missing_content2_content3_content3-tracked
+  A missing_content2_content3_content4-tracked
   A missing_content2_missing_content2-tracked
   A missing_content2_missing_content4-tracked
+  A missing_missing_content3_content3-tracked
+  A missing_missing_content3_content4-tracked
   A missing_missing_missing_content4-tracked
-  R content1_content1_content1_content1-untracked
-  R content1_content1_content1_content4-untracked
-  R content1_content1_content1_missing-untracked
-  R content1_content1_content3_content1-untracked
-  R content1_content1_content3_content3-untracked
-  R content1_content1_content3_content4-untracked
-  R content1_content1_content3_missing-untracked
-  R content1_content2_content1_content1-untracked
-  R content1_content2_content1_content2-untracked
-  R content1_content2_content1_content4-untracked
-  R content1_content2_content1_missing-untracked
-  R content1_content2_content2_content1-untracked
-  R content1_content2_content2_content2-untracked
-  R content1_content2_content2_content4-untracked
-  R content1_content2_content2_missing-untracked
-  R content1_content2_content3_content1-untracked
-  R content1_content2_content3_content2-untracked
-  R content1_content2_content3_content3-untracked
-  R content1_content2_content3_content4-untracked
-  R content1_content2_content3_missing-untracked
-  R content1_missing_content1_content1-untracked
-  R content1_missing_content1_content4-untracked
-  R content1_missing_content1_missing-untracked
-  R content1_missing_content3_content1-untracked
-  R content1_missing_content3_content3-untracked
-  R content1_missing_content3_content4-untracked
-  R content1_missing_content3_missing-untracked
-  R missing_content2_content2_content2-untracked
-  R missing_content2_content2_content4-untracked
-  R missing_content2_content2_missing-untracked
-  R missing_content2_content3_content2-untracked
-  R missing_content2_content3_content3-untracked
-  R missing_content2_content3_content4-untracked
-  R missing_content2_content3_missing-untracked
-  R missing_missing_content3_content3-untracked
-  R missing_missing_content3_content4-untracked
-  R missing_missing_content3_missing-untracked
   ! content1_content1_content1_missing-tracked
   ! content1_content1_content3_missing-tracked
   ! content1_content1_missing_missing-tracked
@@ -114,26 +95,43 @@
   ! missing_content2_missing_missing-tracked
   ! missing_missing_content3_missing-tracked
   ! missing_missing_missing_missing-tracked
+  ? content1_content1_content1_content1-untracked
+  ? content1_content1_content1_content4-untracked
+  ? content1_content1_content3_content1-untracked
+  ? content1_content1_content3_content3-untracked
+  ? content1_content1_content3_content4-untracked
   ? content1_content1_missing_content1-untracked
   ? content1_content1_missing_content4-untracked
+  ? content1_content2_content1_content1-untracked
+  ? content1_content2_content1_content2-untracked
+  ? content1_content2_content1_content4-untracked
+  ? content1_content2_content2_content1-untracked
+  ? content1_content2_content2_content2-untracked
+  ? content1_content2_content2_content4-untracked
+  ? content1_content2_content3_content1-untracked
+  ? content1_content2_content3_content2-untracked
+  ? content1_content2_content3_content3-untracked
+  ? content1_content2_content3_content4-untracked
   ? content1_content2_missing_content1-untracked
   ? content1_content2_missing_content2-untracked
   ? content1_content2_missing_content4-untracked
+  ? content1_missing_content1_content1-untracked
+  ? content1_missing_content1_content4-untracked
+  ? content1_missing_content3_content1-untracked
+  ? content1_missing_content3_content3-untracked
+  ? content1_missing_content3_content4-untracked
   ? content1_missing_missing_content1-untracked
   ? content1_missing_missing_content4-untracked
+  ? missing_content2_content2_content2-untracked
+  ? missing_content2_content2_content4-untracked
+  ? missing_content2_content3_content2-untracked
+  ? missing_content2_content3_content3-untracked
+  ? missing_content2_content3_content4-untracked
   ? missing_content2_missing_content2-untracked
   ? missing_content2_missing_content4-untracked
+  ? missing_missing_content3_content3-untracked
+  ? missing_missing_content3_content4-untracked
   ? missing_missing_missing_content4-untracked
-  C content1_content1_content1_content1-tracked
-  C content1_content1_content3_content3-tracked
-  C content1_content2_content1_content1-tracked
-  C content1_content2_content2_content2-tracked
-  C content1_content2_content3_content3-tracked
-  C content1_missing_content1_content1-tracked
-  C content1_missing_content3_content3-tracked
-  C missing_content2_content2_content2-tracked
-  C missing_content2_content3_content3-tracked
-  C missing_missing_content3_content3-tracked
 
 Merge with remote
 
@@ -142,106 +140,7 @@
 #   in the same way, so it could potentially be left alone
 
   $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
-  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content1_content4-tracked
-  warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging content1_content2_content2_content1-tracked
-  merging content1_content2_content2_content4-tracked
-  warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging content1_content2_content3_content1-tracked
-  merging content1_content2_content3_content3-tracked
-  warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
-  merging content1_content2_content3_content4-tracked
-  warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging content1_content2_missing_content1-tracked
-  merging content1_content2_missing_content4-tracked
-  warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_content2_content4-tracked
-  warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_content3_content3-tracked
-  warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_content3_content4-tracked
-  warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_missing_content4-tracked
-  warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_missing_content4-untracked
-  warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
-  18 files updated, 3 files merged, 8 files removed, 35 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  abort: empty revision set
 
 Check which files need to be resolved (should correspond to the output above).
 This should be the files for which the base (1st filename segment), the remote
@@ -251,44 +150,6 @@
 odd 'if force and branchmerge and different' case in manifestmerge().
 
   $ hg resolve -l
-  U content1_content2_content1_content1-untracked
-  U content1_content2_content1_content2-untracked
-  U content1_content2_content1_content4-tracked
-  U content1_content2_content1_content4-untracked
-  U content1_content2_content1_missing-tracked
-  U content1_content2_content1_missing-untracked
-  R content1_content2_content2_content1-tracked
-  U content1_content2_content2_content1-untracked
-  U content1_content2_content2_content2-untracked
-  U content1_content2_content2_content4-tracked
-  U content1_content2_content2_content4-untracked
-  U content1_content2_content2_missing-tracked
-  U content1_content2_content2_missing-untracked
-  R content1_content2_content3_content1-tracked
-  U content1_content2_content3_content1-untracked
-  U content1_content2_content3_content2-untracked
-  U content1_content2_content3_content3-tracked
-  U content1_content2_content3_content3-untracked
-  U content1_content2_content3_content4-tracked
-  U content1_content2_content3_content4-untracked
-  U content1_content2_content3_missing-tracked
-  U content1_content2_content3_missing-untracked
-  R content1_content2_missing_content1-tracked
-  U content1_content2_missing_content1-untracked
-  U content1_content2_missing_content2-untracked
-  U content1_content2_missing_content4-tracked
-  U content1_content2_missing_content4-untracked
-  U content1_content2_missing_missing-tracked
-  U content1_content2_missing_missing-untracked
-  U content1_missing_content1_content4-tracked
-  U content1_missing_content3_content3-tracked
-  U content1_missing_content3_content4-tracked
-  U content1_missing_missing_content4-tracked
-  U missing_content2_content2_content4-tracked
-  U missing_content2_content3_content3-tracked
-  U missing_content2_content3_content4-tracked
-  U missing_content2_missing_content4-tracked
-  U missing_content2_missing_content4-untracked
 
 Check status and file content
 
@@ -325,46 +186,46 @@
   > }
   $ checkstatus 2>&1 | tee $TESTTMP/status1
   
-  C content1_content1_content1_content1-tracked
-  content1
-  
-  R content1_content1_content1_content1-untracked
-  content1
-  
-  M content1_content1_content1_content4-tracked
-  content4
-  
-  R content1_content1_content1_content4-untracked
+  A content1_content1_content1_content1-tracked
+  content1
+  
+  ? content1_content1_content1_content1-untracked
+  content1
+  
+  A content1_content1_content1_content4-tracked
+  content4
+  
+  ? content1_content1_content1_content4-untracked
   content4
   
   ! content1_content1_content1_missing-tracked
   <missing>
   
-  R content1_content1_content1_missing-untracked
-  <missing>
-  
-  M content1_content1_content3_content1-tracked
-  content1
-  
-  R content1_content1_content3_content1-untracked
-  content1
-  
-  C content1_content1_content3_content3-tracked
-  content3
-  
-  R content1_content1_content3_content3-untracked
-  content3
-  
-  M content1_content1_content3_content4-tracked
-  content4
-  
-  R content1_content1_content3_content4-untracked
+  content1_content1_content1_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_content1_content3_content1-tracked
+  content1
+  
+  ? content1_content1_content3_content1-untracked
+  content1
+  
+  A content1_content1_content3_content3-tracked
+  content3
+  
+  ? content1_content1_content3_content3-untracked
+  content3
+  
+  A content1_content1_content3_content4-tracked
+  content4
+  
+  ? content1_content1_content3_content4-untracked
   content4
   
   ! content1_content1_content3_missing-tracked
   <missing>
   
-  R content1_content1_content3_missing-untracked
+  content1_content1_content3_missing-untracked: $ENOENT$
   <missing>
   
   A content1_content1_missing_content1-tracked
@@ -385,182 +246,152 @@
   content1_content1_missing_missing-untracked: * (glob)
   <missing>
   
-  M content1_content2_content1_content1-tracked
-  content2
-  
-  M content1_content2_content1_content1-untracked
-  content2
-  
-  M content1_content2_content1_content2-tracked
-  content2
-  
-  M content1_content2_content1_content2-untracked
-  content2
-  
-  M content1_content2_content1_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 8ef80617fa20 - test: base
-  content1
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M content1_content2_content1_content4-untracked
-  content2
-  
-  M content1_content2_content1_missing-tracked
-  content2
-  
-  M content1_content2_content1_missing-untracked
-  content2
-  
-  M content1_content2_content2_content1-tracked
-  content2
-  
-  M content1_content2_content2_content1-untracked
-  content2
-  
-  C content1_content2_content2_content2-tracked
-  content2
-  
-  M content1_content2_content2_content2-untracked
-  content2
-  
-  M content1_content2_content2_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 8ef80617fa20 - test: base
-  content1
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M content1_content2_content2_content4-untracked
-  content2
-  
-  M content1_content2_content2_missing-tracked
-  content2
-  
-  M content1_content2_content2_missing-untracked
-  content2
-  
-  M content1_content2_content3_content1-tracked
-  content2
-  
-  M content1_content2_content3_content1-untracked
-  content2
-  
-  M content1_content2_content3_content2-tracked
-  content2
-  
-  M content1_content2_content3_content2-untracked
-  content2
-  
-  M content1_content2_content3_content3-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content3
-  ||||||| common ancestor: 8ef80617fa20 - test: base
-  content1
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M content1_content2_content3_content3-untracked
-  content2
-  
-  M content1_content2_content3_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 8ef80617fa20 - test: base
-  content1
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M content1_content2_content3_content4-untracked
-  content2
-  
-  M content1_content2_content3_missing-tracked
-  content2
-  
-  M content1_content2_content3_missing-untracked
-  content2
-  
-  M content1_content2_missing_content1-tracked
-  content2
-  
-  M content1_content2_missing_content1-untracked
-  content2
-  
-  M content1_content2_missing_content2-tracked
-  content2
-  
-  M content1_content2_missing_content2-untracked
-  content2
-  
-  M content1_content2_missing_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 8ef80617fa20 - test: base
-  content1
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M content1_content2_missing_content4-untracked
-  content2
-  
-  M content1_content2_missing_missing-tracked
-  content2
-  
-  M content1_content2_missing_missing-untracked
-  content2
-  
-  R content1_missing_content1_content1-tracked
-  <missing>
-  
-  R content1_missing_content1_content1-untracked
-  content1
-  
-  M content1_missing_content1_content4-tracked
-  content4
-  
-  R content1_missing_content1_content4-untracked
-  content4
-  
-  R content1_missing_content1_missing-tracked
-  <missing>
-  
-  R content1_missing_content1_missing-untracked
-  <missing>
-  
-  R content1_missing_content3_content1-tracked
-  <missing>
-  
-  R content1_missing_content3_content1-untracked
-  content1
-  
-  C content1_missing_content3_content3-tracked
-  content3
-  
-  R content1_missing_content3_content3-untracked
-  content3
-  
-  M content1_missing_content3_content4-tracked
-  content4
-  
-  R content1_missing_content3_content4-untracked
-  content4
-  
-  R content1_missing_content3_missing-tracked
-  <missing>
-  
-  R content1_missing_content3_missing-untracked
-  <missing>
-  
-  R content1_missing_missing_content1-tracked
-  <missing>
+  A content1_content2_content1_content1-tracked
+  content1
+  
+  ? content1_content2_content1_content1-untracked
+  content1
+  
+  A content1_content2_content1_content2-tracked
+  content2
+  
+  ? content1_content2_content1_content2-untracked
+  content2
+  
+  A content1_content2_content1_content4-tracked
+  content4
+  
+  ? content1_content2_content1_content4-untracked
+  content4
+  
+  ! content1_content2_content1_missing-tracked
+  <missing>
+  
+  content1_content2_content1_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_content2_content2_content1-tracked
+  content1
+  
+  ? content1_content2_content2_content1-untracked
+  content1
+  
+  A content1_content2_content2_content2-tracked
+  content2
+  
+  ? content1_content2_content2_content2-untracked
+  content2
+  
+  A content1_content2_content2_content4-tracked
+  content4
+  
+  ? content1_content2_content2_content4-untracked
+  content4
+  
+  ! content1_content2_content2_missing-tracked
+  <missing>
+  
+  content1_content2_content2_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_content2_content3_content1-tracked
+  content1
+  
+  ? content1_content2_content3_content1-untracked
+  content1
+  
+  A content1_content2_content3_content2-tracked
+  content2
+  
+  ? content1_content2_content3_content2-untracked
+  content2
+  
+  A content1_content2_content3_content3-tracked
+  content3
+  
+  ? content1_content2_content3_content3-untracked
+  content3
+  
+  A content1_content2_content3_content4-tracked
+  content4
+  
+  ? content1_content2_content3_content4-untracked
+  content4
+  
+  ! content1_content2_content3_missing-tracked
+  <missing>
+  
+  content1_content2_content3_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_content2_missing_content1-tracked
+  content1
+  
+  ? content1_content2_missing_content1-untracked
+  content1
+  
+  A content1_content2_missing_content2-tracked
+  content2
+  
+  ? content1_content2_missing_content2-untracked
+  content2
+  
+  A content1_content2_missing_content4-tracked
+  content4
+  
+  ? content1_content2_missing_content4-untracked
+  content4
+  
+  ! content1_content2_missing_missing-tracked
+  <missing>
+  
+  content1_content2_missing_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_missing_content1_content1-tracked
+  content1
+  
+  ? content1_missing_content1_content1-untracked
+  content1
+  
+  A content1_missing_content1_content4-tracked
+  content4
+  
+  ? content1_missing_content1_content4-untracked
+  content4
+  
+  ! content1_missing_content1_missing-tracked
+  <missing>
+  
+  content1_missing_content1_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_missing_content3_content1-tracked
+  content1
+  
+  ? content1_missing_content3_content1-untracked
+  content1
+  
+  A content1_missing_content3_content3-tracked
+  content3
+  
+  ? content1_missing_content3_content3-untracked
+  content3
+  
+  A content1_missing_content3_content4-tracked
+  content4
+  
+  ? content1_missing_content3_content4-untracked
+  content4
+  
+  ! content1_missing_content3_missing-tracked
+  <missing>
+  
+  content1_missing_content3_missing-untracked: $ENOENT$
+  <missing>
+  
+  A content1_missing_missing_content1-tracked
+  content1
   
   ? content1_missing_missing_content1-untracked
   content1
@@ -571,113 +402,88 @@
   ? content1_missing_missing_content4-untracked
   content4
   
-  R content1_missing_missing_missing-tracked
-  <missing>
-  
-  content1_missing_missing_missing-untracked: * (glob)
-  <missing>
-  
-  C missing_content2_content2_content2-tracked
-  content2
-  
-  M missing_content2_content2_content2-untracked
-  content2
-  
-  M missing_content2_content2_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 000000000000 - : 
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M missing_content2_content2_content4-untracked
-  content2
-  
-  M missing_content2_content2_missing-tracked
-  content2
-  
-  M missing_content2_content2_missing-untracked
-  content2
-  
-  M missing_content2_content3_content2-tracked
-  content2
-  
-  M missing_content2_content3_content2-untracked
-  content2
-  
-  M missing_content2_content3_content3-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content3
-  ||||||| common ancestor: 000000000000 - : 
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M missing_content2_content3_content3-untracked
-  content2
-  
-  M missing_content2_content3_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 000000000000 - : 
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M missing_content2_content3_content4-untracked
-  content2
-  
-  M missing_content2_content3_missing-tracked
-  content2
-  
-  M missing_content2_content3_missing-untracked
-  content2
-  
-  M missing_content2_missing_content2-tracked
-  content2
-  
-  M missing_content2_missing_content2-untracked
-  content2
-  
-  M missing_content2_missing_content4-tracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 000000000000 - : 
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M missing_content2_missing_content4-untracked
-  <<<<<<< working copy:    0447570f1af6 - test: local
-  content4
-  ||||||| common ancestor: 000000000000 - : 
-  =======
-  content2
-  >>>>>>> merge rev:       85100b8c675b - test: remote
-  
-  M missing_content2_missing_missing-tracked
-  content2
-  
-  M missing_content2_missing_missing-untracked
-  content2
-  
-  C missing_missing_content3_content3-tracked
-  content3
-  
-  R missing_missing_content3_content3-untracked
-  content3
-  
-  M missing_missing_content3_content4-tracked
-  content4
-  
-  R missing_missing_content3_content4-untracked
-  content4
-  
-  R missing_missing_content3_missing-tracked
-  <missing>
-  
-  R missing_missing_content3_missing-untracked
+  ! content1_missing_missing_missing-tracked
+  <missing>
+  
+  content1_missing_missing_missing-untracked: $ENOENT$
+  <missing>
+  
+  A missing_content2_content2_content2-tracked
+  content2
+  
+  ? missing_content2_content2_content2-untracked
+  content2
+  
+  A missing_content2_content2_content4-tracked
+  content4
+  
+  ? missing_content2_content2_content4-untracked
+  content4
+  
+  ! missing_content2_content2_missing-tracked
+  <missing>
+  
+  missing_content2_content2_missing-untracked: $ENOENT$
+  <missing>
+  
+  A missing_content2_content3_content2-tracked
+  content2
+  
+  ? missing_content2_content3_content2-untracked
+  content2
+  
+  A missing_content2_content3_content3-tracked
+  content3
+  
+  ? missing_content2_content3_content3-untracked
+  content3
+  
+  A missing_content2_content3_content4-tracked
+  content4
+  
+  ? missing_content2_content3_content4-untracked
+  content4
+  
+  ! missing_content2_content3_missing-tracked
+  <missing>
+  
+  missing_content2_content3_missing-untracked: $ENOENT$
+  <missing>
+  
+  A missing_content2_missing_content2-tracked
+  content2
+  
+  ? missing_content2_missing_content2-untracked
+  content2
+  
+  A missing_content2_missing_content4-tracked
+  content4
+  
+  ? missing_content2_missing_content4-untracked
+  content4
+  
+  ! missing_content2_missing_missing-tracked
+  <missing>
+  
+  missing_content2_missing_missing-untracked: $ENOENT$
+  <missing>
+  
+  A missing_missing_content3_content3-tracked
+  content3
+  
+  ? missing_missing_content3_content3-untracked
+  content3
+  
+  A missing_missing_content3_content4-tracked
+  content4
+  
+  ? missing_missing_content3_content4-untracked
+  content4
+  
+  ! missing_missing_content3_missing-tracked
+  <missing>
+  
+  missing_missing_content3_missing-untracked: $ENOENT$
   <missing>
   
   A missing_missing_missing_content4-tracked
@@ -686,10 +492,10 @@
   ? missing_missing_missing_content4-untracked
   content4
   
-  R missing_missing_missing_missing-tracked
-  <missing>
-  
-  missing_missing_missing_missing-untracked: * (glob)
+  ! missing_missing_missing_missing-tracked
+  <missing>
+  
+  missing_missing_missing_missing-untracked: $ENOENT$
   <missing>
 
   $ for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3`
@@ -700,139 +506,29 @@
   >     cat ${f}.orig
   >   fi
   > done
-  content1_content2_content1_content4-tracked.orig:
-  content4
-  content1_content2_content2_content4-tracked.orig:
-  content4
-  content1_content2_content3_content3-tracked.orig:
-  content3
-  content1_content2_content3_content4-tracked.orig:
-  content4
-  content1_content2_missing_content4-tracked.orig:
-  content4
-  missing_content2_content2_content4-tracked.orig:
-  content4
-  missing_content2_content3_content3-tracked.orig:
-  content3
-  missing_content2_content3_content4-tracked.orig:
-  content4
-  missing_content2_missing_content4-tracked.orig:
-  content4
-  missing_content2_missing_content4-untracked.orig:
-  content4
 
 Re-resolve and check status
 
   $ hg resolve --unmark --all
+  abort: resolve command not applicable when not merging
+  [20]
   $ hg resolve --all --tool :local
-  (no more unresolved files)
+  abort: resolve command not applicable when not merging
+  [20]
   $ hg resolve --unmark --all
+  abort: resolve command not applicable when not merging
+  [20]
   $ hg resolve --all --tool internal:merge3
-  file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content1_content4-tracked
-  warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
-  file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content2_content1-tracked
-  file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content2_content4-tracked
-  warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
-  file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content3_content1-tracked
-  file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content3_content3-tracked
-  warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
-  file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_content3_content4-tracked
-  warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
-  file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_missing_content1-tracked
-  file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  merging content1_content2_missing_content4-tracked
-  warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
-  file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  merging missing_content2_content2_content4-tracked
-  warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_content3_content3-tracked
-  warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_content3_content4-tracked
-  warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_missing_content4-tracked
-  warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
-  merging missing_content2_missing_content4-untracked
-  warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
-  [1]
+  abort: resolve command not applicable when not merging
+  [20]
   $ checkstatus > $TESTTMP/status2 2>&1
   $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2
 
 Set up working directory again
 
   $ hg -q update --clean 2
+  abort: unknown revision '2'
+  [10]
   $ hg --config extensions.purge= purge
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc
   $ hg addremove -q --similarity 0
@@ -841,5 +537,5 @@
 
 Merge with checkunknown = warn, see that behavior is the same as before
   $ hg merge -f --tool internal:merge3 'desc("remote")' --config merge.checkunknown=warn > $TESTTMP/merge-output-2 2>&1
-  [1]
+  [10]
   $ cmp $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 || diff -U8 $TESTTMP/merge-output-1 $TESTTMP/merge-output-2
# Timout reached for process 1073197 

ERROR: test-merge-force.t output changed
!# Ret was: 0 (test-merge-force.t) 
test-check-clang-format.t
test-check-clang-format.t ... # Test test-check-clang-format.t 
# Running sh "/tmp/hgtests.qiewis6n/child153/test-check-clang-format.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-clang-format.t) 
test-convert-cvs-branch.t
test-convert-cvs-branch.t ... # Test test-convert-cvs-branch.t 
# Timout reached for process 1074536 
# Running sh "/tmp/hgtests.qiewis6n/child154/test-convert-cvs-branch.t.sh" 
skipped missing feature: cvs client/server
# Ret was: 80 (test-convert-cvs-branch.t) 
test-commit-amend.t
test-commit-amend.t ... # Test test-commit-amend.t 
# Timout reached for process 1074546 
# Running sh "/tmp/hgtests.qiewis6n/child155/test-commit-amend.t.sh" 
# Timout reached for process 1073139 
# Ret was: 0 (test-bookmarks.t) 
ok
test-largefiles-misc.t
test-largefiles-misc.t ... # Test test-largefiles-misc.t 
# Running sh "/tmp/hgtests.qiewis6n/child156/test-largefiles-misc.t.sh" 
# Timout reached for process 1073473 
# Ret was: 0 (test-revset2.t) 
ok
test-hgweb-diffs.t
test-hgweb-diffs.t ... # Test test-hgweb-diffs.t 
# Running sh "/tmp/hgtests.qiewis6n/child157/test-hgweb-diffs.t.sh" 
# Killing daemon process 1075454 
# Timout reached for process 1075193 
# Ret was: 0 (test-hgweb-diffs.t) 
ok
test-check-rust-format.t
test-check-rust-format.t ... # Test test-check-rust-format.t 
# Running sh "/tmp/hgtests.qiewis6n/child158/test-check-rust-format.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-rust-format.t) 
test-template-keywords.t
test-template-keywords.t ... # Test test-template-keywords.t 
# Running sh "/tmp/hgtests.qiewis6n/child159/test-template-keywords.t.sh" 
# Timout reached for process 1075470 
# Timout reached for process 1074375 
# Ret was: 0 (test-clone.t) 
ok
test-persistent-nodemap.t
test-persistent-nodemap.t ... # Test test-persistent-nodemap.t 
# Running sh "/tmp/hgtests.qiewis6n/child160/test-persistent-nodemap.t.sh" 
# Ret was: 0 (test-commit-amend.t) 
ok
test-bundle.t
test-bundle.t ... # Test test-bundle.t 
# Timout reached for process 1074555 
# Running sh "/tmp/hgtests.qiewis6n/child161/test-bundle.t.sh" 
# Timout reached for process 1074757 
# Ret was: 0 (test-largefiles-misc.t) 
ok
test-tags.t
test-tags.t ... # Test test-tags.t 
# Running sh "/tmp/hgtests.qiewis6n/child162/test-tags.t.sh" 
# Ret was: 0 (test-template-keywords.t) 
ok
test-revert.t
test-revert.t ... # Test test-revert.t 
# Timout reached for process 1075474 
# Running sh "/tmp/hgtests.qiewis6n/child163/test-revert.t.sh" 
# Timout reached for process 1076049 
# Ret was: 0 (test-bundle.t) 
ok
test-keyword.t
test-keyword.t ... # Test test-keyword.t 
# Running sh "/tmp/hgtests.qiewis6n/child164/test-keyword.t.sh" 
# Ret was: 0 (test-tags.t) 
ok
test-merge-criss-cross.t#newfilenode
test-merge-criss-cross.t#newfilenode ... # Test test-merge-criss-cross.t#newfilenode 
# Timout reached for process 1078643 
# Running sh "/tmp/hgtests.qiewis6n/child165/test-merge-criss-cross.t-newfilenode.sh" 

--- /<<PKGBUILDDIR>>/tests/test-revert.t
+++ /<<PKGBUILDDIR>>/tests/test-revert.t.err
@@ -612,6 +612,8 @@
   A content1_missing_missing-tracked
   A content1_missing_missing-untracked
   $ hg commit -m 'base'
+  Bus error
+  [135]
 
 (create a simple text version of the content)
 
@@ -655,27 +657,30 @@
   adding missing_content2_missing-tracked
   adding missing_content2_missing-untracked
   $ hg status
-  M content1_content2_content1-tracked
-  M content1_content2_content1-untracked
-  M content1_content2_content2-tracked
-  M content1_content2_content2-untracked
-  M content1_content2_content3-tracked
-  M content1_content2_content3-untracked
-  M content1_content2_missing-tracked
-  M content1_content2_missing-untracked
+  A content1_content1_content1-tracked
+  A content1_content1_content1-untracked
+  A content1_content1_content3-tracked
+  A content1_content1_content3-untracked
+  A content1_content1_missing-tracked
+  A content1_content1_missing-untracked
+  A content1_content2_content1-tracked
+  A content1_content2_content1-untracked
+  A content1_content2_content2-tracked
+  A content1_content2_content2-untracked
+  A content1_content2_content3-tracked
+  A content1_content2_content3-untracked
+  A content1_content2_missing-tracked
+  A content1_content2_missing-untracked
   A missing_content2_content2-tracked
   A missing_content2_content2-untracked
   A missing_content2_content3-tracked
   A missing_content2_content3-untracked
   A missing_content2_missing-tracked
   A missing_content2_missing-untracked
-  R content1_missing_content1-tracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-tracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-tracked
-  R content1_missing_missing-untracked
   $ hg commit -m 'parent'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 (create a simple text version of the content)
 
@@ -719,56 +724,35 @@
   $ hg forget *_*_*-untracked
   $ rm *_*_missing-*
   $ hg status
-  M content1_content1_content3-tracked
-  M content1_content2_content1-tracked
-  M content1_content2_content3-tracked
-  M missing_content2_content3-tracked
+  A content1_content1_content1-tracked
+  A content1_content1_content3-tracked
+  A content1_content2_content1-tracked
+  A content1_content2_content2-tracked
+  A content1_content2_content3-tracked
   A content1_missing_content1-tracked
   A content1_missing_content3-tracked
+  A missing_content2_content2-tracked
+  A missing_content2_content3-tracked
   A missing_missing_content3-tracked
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R missing_content2_content2-untracked
-  R missing_content2_content3-untracked
-  R missing_content2_missing-untracked
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked
   ! content1_missing_missing-tracked
   ! missing_content2_missing-tracked
   ! missing_missing_missing-tracked
+  ? content1_content1_content1-untracked
+  ? content1_content1_content3-untracked
+  ? content1_content2_content1-untracked
+  ? content1_content2_content2-untracked
+  ? content1_content2_content3-untracked
   ? content1_missing_content1-untracked
   ? content1_missing_content3-untracked
+  ? missing_content2_content2-untracked
+  ? missing_content2_content3-untracked
   ? missing_missing_content3-untracked
 
   $ hg status --rev 'desc("base")'
-  M content1_content1_content3-tracked
-  M content1_content2_content2-tracked
-  M content1_content2_content3-tracked
-  M content1_missing_content3-tracked
-  A missing_content2_content2-tracked
-  A missing_content2_content3-tracked
-  A missing_missing_content3-tracked
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-untracked
-  ! content1_content1_missing-tracked
-  ! content1_content2_missing-tracked
-  ! content1_missing_missing-tracked
-  ! missing_content2_missing-tracked
-  ! missing_missing_missing-tracked
-  ? missing_missing_content3-untracked
+  abort: empty revision range
+  [10]
 
 (create a simple text version of the content)
 
@@ -808,28 +792,21 @@
 check revert output
 
   $ hg revert --all
+  forgetting content1_content1_content1-tracked
+  forgetting content1_content1_content3-tracked
+  forgetting content1_content1_missing-tracked
+  forgetting content1_content2_content1-tracked
+  forgetting content1_content2_content2-tracked
+  forgetting content1_content2_content3-tracked
+  forgetting content1_content2_missing-tracked
   forgetting content1_missing_content1-tracked
   forgetting content1_missing_content3-tracked
   forgetting content1_missing_missing-tracked
+  forgetting missing_content2_content2-tracked
+  forgetting missing_content2_content3-tracked
+  forgetting missing_content2_missing-tracked
   forgetting missing_missing_content3-tracked
   forgetting missing_missing_missing-tracked
-  reverting content1_content1_content3-tracked
-  reverting content1_content1_missing-tracked
-  reverting content1_content2_content1-tracked
-  reverting content1_content2_content3-tracked
-  reverting content1_content2_missing-tracked
-  reverting missing_content2_content3-tracked
-  reverting missing_content2_missing-tracked
-  undeleting content1_content1_content1-untracked
-  undeleting content1_content1_content3-untracked
-  undeleting content1_content1_missing-untracked
-  undeleting content1_content2_content1-untracked
-  undeleting content1_content2_content2-untracked
-  undeleting content1_content2_content3-untracked
-  undeleting content1_content2_missing-untracked
-  undeleting missing_content2_content2-untracked
-  undeleting missing_content2_content3-untracked
-  undeleting missing_content2_missing-untracked
 
 Compare resulting directory with revert target.
 
@@ -839,18 +816,32 @@
   $ "$PYTHON" ../dircontent.py > ../content-parent-all.txt
   $ cd ..
   $ diff -U 0 -- content-parent.txt content-parent-all.txt | grep _
-  +content3 content1_content1_content3-tracked.orig
-  +content3 content1_content1_content3-untracked.orig
-  +content1 content1_content2_content1-tracked.orig
-  +content1 content1_content2_content1-untracked.orig
-  +content3 content1_content2_content3-tracked.orig
-  +content3 content1_content2_content3-untracked.orig
+  -content1 content1_content1_content3-tracked
+  -content1 content1_content1_content3-untracked
+  -content1 content1_content1_missing-tracked
+  -content1 content1_content1_missing-untracked
+  -content2 content1_content2_content1-tracked
+  -content2 content1_content2_content1-untracked
+  +content3 content1_content1_content3-tracked
+  +content3 content1_content1_content3-untracked
+  +content1 content1_content2_content1-tracked
+  +content1 content1_content2_content1-untracked
+  -content2 content1_content2_content3-tracked
+  -content2 content1_content2_content3-untracked
+  -content2 content1_content2_missing-tracked
+  -content2 content1_content2_missing-untracked
+  +content3 content1_content2_content3-tracked
+  +content3 content1_content2_content3-untracked
   +content1 content1_missing_content1-tracked
   +content1 content1_missing_content1-untracked
   +content3 content1_missing_content3-tracked
   +content3 content1_missing_content3-untracked
-  +content3 missing_content2_content3-tracked.orig
-  +content3 missing_content2_content3-untracked.orig
+  -content2 missing_content2_content3-tracked
+  -content2 missing_content2_content3-untracked
+  -content2 missing_content2_missing-tracked
+  -content2 missing_content2_missing-untracked
+  +content3 missing_content2_content3-tracked
+  +content3 missing_content2_content3-untracked
   +content3 missing_missing_content3-tracked
   +content3 missing_missing_content3-untracked
 
@@ -865,28 +856,8 @@
 check revert output
 
   $ hg revert --all --rev 'desc(base)'
-  forgetting missing_missing_content3-tracked
-  forgetting missing_missing_missing-tracked
-  removing missing_content2_content2-tracked
-  removing missing_content2_content3-tracked
-  removing missing_content2_missing-tracked
-  reverting content1_content1_content3-tracked
-  reverting content1_content1_missing-tracked
-  reverting content1_content2_content2-tracked
-  reverting content1_content2_content3-tracked
-  reverting content1_content2_missing-tracked
-  reverting content1_missing_content3-tracked
-  reverting content1_missing_missing-tracked
-  adding content1_missing_content1-untracked
-  adding content1_missing_content3-untracked
-  adding content1_missing_missing-untracked
-  undeleting content1_content1_content1-untracked
-  undeleting content1_content1_content3-untracked
-  undeleting content1_content1_missing-untracked
-  undeleting content1_content2_content1-untracked
-  undeleting content1_content2_content2-untracked
-  undeleting content1_content2_content3-untracked
-  undeleting content1_content2_missing-untracked
+  abort: empty revision set
+  [10]
 
 Compare resulting directory with revert target.
 
@@ -896,15 +867,31 @@
   $ "$PYTHON" ../dircontent.py > ../content-base-all.txt
   $ cd ..
   $ diff -U 0 -- content-base.txt content-base-all.txt | grep _
-  +content3 content1_content1_content3-tracked.orig
-  +content3 content1_content1_content3-untracked.orig
-  +content2 content1_content2_content2-untracked.orig
-  +content3 content1_content2_content3-tracked.orig
-  +content3 content1_content2_content3-untracked.orig
-  +content3 content1_missing_content3-tracked.orig
-  +content3 content1_missing_content3-untracked.orig
+  -content1 content1_content1_content3-tracked
+  -content1 content1_content1_content3-untracked
+  -content1 content1_content1_missing-tracked
+  -content1 content1_content1_missing-untracked
+  +content3 content1_content1_content3-tracked
+  +content3 content1_content1_content3-untracked
+  -content1 content1_content2_content2-tracked
+  -content1 content1_content2_content2-untracked
+  -content1 content1_content2_content3-tracked
+  -content1 content1_content2_content3-untracked
+  -content1 content1_content2_missing-tracked
+  -content1 content1_content2_missing-untracked
+  +content2 content1_content2_content2-tracked
+  +content2 content1_content2_content2-untracked
+  +content3 content1_content2_content3-tracked
+  +content3 content1_content2_content3-untracked
+  -content1 content1_missing_content3-tracked
+  -content1 content1_missing_content3-untracked
+  -content1 content1_missing_missing-tracked
+  -content1 content1_missing_missing-untracked
+  +content3 content1_missing_content3-tracked
+  +content3 content1_missing_content3-untracked
+  +content2 missing_content2_content2-tracked
   +content2 missing_content2_content2-untracked
-  +content3 missing_content2_content3-tracked.orig
+  +content3 missing_content2_content3-tracked
   +content3 missing_content2_content3-untracked
   +content3 missing_missing_content3-tracked
   +content3 missing_missing_content3-untracked
@@ -926,34 +913,39 @@
   >   echo
   > done
   ### revert for: content1_content1_content1-tracked
-  no changes needed to content1_content1_content1-tracked
   
   ### revert for: content1_content1_content1-untracked
+  file not managed: content1_content1_content1-untracked
   
   ### revert for: content1_content1_content3-tracked
   
   ### revert for: content1_content1_content3-untracked
+  file not managed: content1_content1_content3-untracked
   
   ### revert for: content1_content1_missing-tracked
   
   ### revert for: content1_content1_missing-untracked
+  content1_content1_missing-untracked: no such file in rev 000000000000
   
   ### revert for: content1_content2_content1-tracked
   
   ### revert for: content1_content2_content1-untracked
+  file not managed: content1_content2_content1-untracked
   
   ### revert for: content1_content2_content2-tracked
-  no changes needed to content1_content2_content2-tracked
   
   ### revert for: content1_content2_content2-untracked
+  file not managed: content1_content2_content2-untracked
   
   ### revert for: content1_content2_content3-tracked
   
   ### revert for: content1_content2_content3-untracked
+  file not managed: content1_content2_content3-untracked
   
   ### revert for: content1_content2_missing-tracked
   
   ### revert for: content1_content2_missing-untracked
+  content1_content2_missing-untracked: no such file in rev 000000000000
   
   ### revert for: content1_missing_content1-tracked
   
@@ -971,17 +963,19 @@
   content1_missing_missing-untracked: no such file in rev * (glob)
   
   ### revert for: missing_content2_content2-tracked
-  no changes needed to missing_content2_content2-tracked
   
   ### revert for: missing_content2_content2-untracked
+  file not managed: missing_content2_content2-untracked
   
   ### revert for: missing_content2_content3-tracked
   
   ### revert for: missing_content2_content3-untracked
+  file not managed: missing_content2_content3-untracked
   
   ### revert for: missing_content2_missing-tracked
   
   ### revert for: missing_content2_missing-untracked
+  missing_content2_missing-untracked: no such file in rev 000000000000
   
   ### revert for: missing_missing_content3-tracked
   
@@ -1019,72 +1013,94 @@
   >   echo
   > done
   ### revert for: content1_content1_content1-tracked
-  no changes needed to content1_content1_content1-tracked
+  abort: empty revision set
   
   ### revert for: content1_content1_content1-untracked
+  abort: empty revision set
   
   ### revert for: content1_content1_content3-tracked
+  abort: empty revision set
   
   ### revert for: content1_content1_content3-untracked
+  abort: empty revision set
   
   ### revert for: content1_content1_missing-tracked
+  abort: empty revision set
   
   ### revert for: content1_content1_missing-untracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content1-tracked
-  no changes needed to content1_content2_content1-tracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content1-untracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content2-tracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content2-untracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content3-tracked
+  abort: empty revision set
   
   ### revert for: content1_content2_content3-untracked
+  abort: empty revision set
   
   ### revert for: content1_content2_missing-tracked
+  abort: empty revision set
   
   ### revert for: content1_content2_missing-untracked
+  abort: empty revision set
   
   ### revert for: content1_missing_content1-tracked
-  no changes needed to content1_missing_content1-tracked
+  abort: empty revision set
   
   ### revert for: content1_missing_content1-untracked
+  abort: empty revision set
   
   ### revert for: content1_missing_content3-tracked
+  abort: empty revision set
   
   ### revert for: content1_missing_content3-untracked
+  abort: empty revision set
   
   ### revert for: content1_missing_missing-tracked
+  abort: empty revision set
   
   ### revert for: content1_missing_missing-untracked
+  abort: empty revision set
   
   ### revert for: missing_content2_content2-tracked
+  abort: empty revision set
   
   ### revert for: missing_content2_content2-untracked
-  no changes needed to missing_content2_content2-untracked
+  abort: empty revision set
   
   ### revert for: missing_content2_content3-tracked
+  abort: empty revision set
   
   ### revert for: missing_content2_content3-untracked
-  no changes needed to missing_content2_content3-untracked
+  abort: empty revision set
   
   ### revert for: missing_content2_missing-tracked
+  abort: empty revision set
   
   ### revert for: missing_content2_missing-untracked
-  no changes needed to missing_content2_missing-untracked
+  abort: empty revision set
   
   ### revert for: missing_missing_content3-tracked
+  abort: empty revision set
   
   ### revert for: missing_missing_content3-untracked
-  file not managed: missing_missing_content3-untracked
+  abort: empty revision set
   
   ### revert for: missing_missing_missing-tracked
+  abort: empty revision set
   
   ### revert for: missing_missing_missing-untracked
-  missing_missing_missing-untracked: no such file in rev * (glob)
+  abort: empty revision set
   
 
 check resulting directory against the --all run
# Timout reached for process 1079658 

ERROR: test-revert.t output changed
!# Ret was: 0 (test-revert.t) 
test-merge-criss-cross.t#old
test-merge-criss-cross.t#old ... # Test test-merge-criss-cross.t#old 
# Running sh "/tmp/hgtests.qiewis6n/child166/test-merge-criss-cross.t-old.sh" 
# Timout reached for process 1075645 

--- /<<PKGBUILDDIR>>/tests/test-persistent-nodemap.t
+++ /<<PKGBUILDDIR>>/tests/test-persistent-nodemap.t.err
@@ -79,30 +79,22 @@
   compression:        zstd (zstd !)
   compression-level:  default
   $ hg debugbuilddag .+5000 --new-file
-
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  Bus error
+  [135]
+
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ f --size .hg/store/00changelog.n
-  .hg/store/00changelog.n: size=62
+  .hg/store/00changelog.n: file not found
 
   $ hg debugnodemap --metadata --manifest
-  uid: ???????? (glob)
-  tip-rev: 5000
-  tip-node: 513d42790a19f0f60c6ebea54b9543bc9537b959
-  data-length: 120960
-  data-unused: 0
-  data-unused: 0.000%
 
 Simple lookup works
 
   $ ANYNODE=`hg log --template '{node|short}\n' --rev tip`
   $ hg log -r "$ANYNODE" --template '{rev}\n'
-  5000
+  -1
 
 
 #if rust
@@ -137,38 +129,24 @@
 #else
 
   $ f --sha256 .hg/store/00changelog-*.nd
-  .hg/store/00changelog-????????.nd: sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79 (glob)
+  .hg/store/00changelog-*.nd: file not found
   $ hg debugnodemap --dump-new | f --sha256 --size
-  size=121088, sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79
+  abort: cannot give path to non-revlog
+  size=0, sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
   $ hg debugnodemap --dump-disk | f --sha256 --bytes=256 --hexdump --size
-  size=121088, sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79
-  0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0020: ff ff ff ff ff ff f5 06 ff ff ff ff ff ff f3 e7 |................|
-  0030: ff ff ef ca ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0040: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0050: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ed 08 |................|
-  0060: ff ff ed 66 ff ff ff ff ff ff ff ff ff ff ff ff |...f............|
-  0070: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  0090: ff ff ff ff ff ff ff ff ff ff ff ff ff ff f6 ed |................|
-  00a0: ff ff ff ff ff ff fe 61 ff ff ff ff ff ff ff ff |.......a........|
-  00b0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  00c0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
-  00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff f1 02 |................|
-  00f0: ff ff ff ff ff ff ed 1b ff ff ff ff ff ff ff ff |................|
+  abort: cannot give path to non-revlog
+  size=0, sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 
 #endif
 
   $ hg debugnodemap --check
-  revisions in index:   5001
-  revisions in nodemap: 5001
+  abort: cannot give path to non-revlog
+  [10]
 
 add a new commit
 
   $ hg up
-  5001 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > foo
   $ hg add foo
 
@@ -188,11 +166,10 @@
   $ hg log -r . --config "storage.revlog.persistent-nodemap.slow-path=warn"
   warning: accessing `persistent-nodemap` repository without associated fast implementation.
   (check `hg help config.format.use-persistent-nodemap` for details)
-  changeset:   5000:6b02b8c7b966
+  changeset:   -1:000000000000
   tag:         tip
-  user:        debugbuilddag
-  date:        Thu Jan 01 01:23:20 1970 +0000
-  summary:     r5000
+  user:        
+  date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg ci -m 'foo' --config "storage.revlog.persistent-nodemap.slow-path=abort"
   abort: accessing `persistent-nodemap` repository without associated fast implementation.
@@ -209,15 +186,14 @@
 #endif
 
   $ hg ci -m 'foo'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 #if no-pure no-rust
   $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5001
-  tip-node: 16395c3cf7e231394735e6b1717823ada303fb0c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
+  [10]
 #else
   $ hg debugnodemap --metadata
   uid: ???????? (glob)
@@ -229,7 +205,7 @@
 #endif
 
   $ f --size .hg/store/00changelog.n
-  .hg/store/00changelog.n: size=62
+  .hg/store/00changelog.n: file not found
 
 (The pure code use the debug code that perform incremental update, the C code reencode from scratch)
 
@@ -245,12 +221,12 @@
 
 #if no-pure no-rust
   $ f --sha256 .hg/store/00changelog-*.nd --size
-  .hg/store/00changelog-????????.nd: size=121088, sha256=df7c06a035b96cb28c7287d349d603baef43240be7736fe34eea419a49702e17 (glob)
+  .hg/store/00changelog-*.nd: file not found
 #endif
 
   $ hg debugnodemap --check
-  revisions in index:   5002
-  revisions in nodemap: 5002
+  abort: cannot give path to non-revlog
+  [10]
 
 Test code path without mmap
 ---------------------------
@@ -258,13 +234,16 @@
   $ echo bar > bar
   $ hg add bar
   $ hg ci -m 'bar' --config storage.revlog.persistent-nodemap.mmap=no
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg debugnodemap --check --config storage.revlog.persistent-nodemap.mmap=yes
-  revisions in index:   5003
-  revisions in nodemap: 5003
+  abort: cannot give path to non-revlog
+  [10]
   $ hg debugnodemap --check --config storage.revlog.persistent-nodemap.mmap=no
-  revisions in index:   5003
-  revisions in nodemap: 5003
+  abort: cannot give path to non-revlog
+  [10]
 
 
 #if pure
@@ -291,21 +270,84 @@
 #endif
 #if no-pure no-rust
   $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5002
-  tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
+  [10]
   $ f --sha256 .hg/store/00changelog-*.nd --size
-  .hg/store/00changelog-????????.nd: size=121088, sha256=59fcede3e3cc587755916ceed29e3c33748cd1aa7d2f91828ac83e7979d935e8 (glob)
+  .hg/store/00changelog-*.nd: file not found
 #endif
 
 Test force warming the cache
 
   $ rm .hg/store/00changelog.n
-  $ hg debugnodemap --metadata
+  rm: cannot remove '.hg/store/00changelog.n': $ENOENT$
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ hg debugupdatecache
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: share
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4025, in debugupdatecaches
+      repo.updatecaches(caches=repository.CACHES_ALL)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 241, in wrapper
+      return orig(repo.unfiltered(), *args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 2940, in updatecaches
+      for entry in self.store.walk():
+                   ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
 #if pure
   $ hg debugnodemap --metadata
   uid: ???????? (glob)
@@ -316,12 +358,8 @@
   data-unused: 0.000%
 #else
   $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5002
-  tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
+  [10]
 #endif
 
 Check out of sync nodemap
@@ -331,6 +369,9 @@
 
   $ mkdir ../tmp-copies
   $ cp .hg/store/00changelog-????????.nd .hg/store/00changelog.n ../tmp-copies
+  cp: cannot stat '.hg/store/00changelog-????????.nd': $ENOENT$
+  cp: cannot stat '.hg/store/00changelog.n': $ENOENT$
+  [1]
 
 Nodemap lagging behind
 ----------------------
@@ -339,35 +380,32 @@
 
   $ echo bar2 > bar
   $ hg ci -m 'bar2'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ NODE=`hg log -r tip -T '{node}\n'`
   $ hg log -r "$NODE" -T '{rev}\n'
-  5003
+  -1
 
 If the nodemap is lagging behind, it can catch up fine
 
   $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5003
-  tip-node: c9329770f979ade2d16912267c38ba5f82fd37b3
+  abort: cannot give path to non-revlog
   data-length: 121344 (pure !)
   data-length: 121344 (rust !)
-  data-length: 121152 (no-rust no-pure !)
   data-unused: 192 (pure !)
   data-unused: 192 (rust !)
-  data-unused: 0 (no-rust no-pure !)
   data-unused: 0.158% (pure !)
   data-unused: 0.158% (rust !)
-  data-unused: 0.000% (no-rust no-pure !)
+  [10]
   $ cp -f ../tmp-copies/* .hg/store/
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5002
-  tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  cp: cannot stat '../tmp-copies/*': $ENOENT$
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ hg log -r "$NODE" -T '{rev}\n'
-  5003
+  -1
 
 changelog altered
 -----------------
@@ -377,75 +415,142 @@
 compatible with the persistent nodemap. We need to detect that.
 
   $ hg up "$NODE~5"
-  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo bar > babar
   $ hg add babar
   $ hg ci -m 'babar'
-  created new head
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ OTHERNODE=`hg log -r tip -T '{node}\n'`
   $ hg log -r "$OTHERNODE" -T '{rev}\n'
-  5004
+  -1
 
   $ hg --config extensions.strip= strip --rev "$NODE~1" --no-backup
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 the nodemap should detect the changelog have been tampered with and recover.
 
   $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5002
-  tip-node: b355ef8adce0949b8bdf6afc72ca853740d65944
+  abort: cannot give path to non-revlog
   data-length: 121536 (pure !)
   data-length: 121088 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 448 (pure !)
   data-unused: 0 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.000% (rust !)
   data-unused: 0.369% (pure !)
-  data-unused: 0.000% (no-pure no-rust !)
+  [10]
 
   $ cp -f ../tmp-copies/* .hg/store/
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5002
-  tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  cp: cannot stat '../tmp-copies/*': $ENOENT$
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ hg log -r "$OTHERNODE" -T '{rev}\n'
-  5002
+  -1
 
 missing data file
 -----------------
 
   $ UUID=`hg debugnodemap --metadata| grep 'uid:' | \
   > sed 's/uid: //'`
+  abort: cannot give path to non-revlog
   $ FILE=.hg/store/00changelog-"${UUID}".nd
   $ mv $FILE ../tmp-data-file
+  mv: cannot stat '.hg/store/00changelog-.nd': $ENOENT$
+  [1]
   $ cp .hg/store/00changelog.n ../tmp-docket
+  cp: cannot stat '.hg/store/00changelog.n': $ENOENT$
+  [1]
 
 mercurial don't crash
 
   $ hg log -r .
-  changeset:   5002:b355ef8adce0
+  changeset:   -1:000000000000
   tag:         tip
-  parent:      4998:d918ad6d18d3
-  user:        test
+  user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     babar
-  
-  $ hg debugnodemap --metadata
+  
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
 
   $ hg debugupdatecache
-  $ hg debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5002
-  tip-node: b355ef8adce0949b8bdf6afc72ca853740d65944
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: share
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4025, in debugupdatecaches
+      repo.updatecaches(caches=repository.CACHES_ALL)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 241, in wrapper
+      return orig(repo.unfiltered(), *args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 2940, in updatecaches
+      for entry in self.store.walk():
+                   ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ mv ../tmp-data-file $FILE
+  mv: cannot stat '../tmp-data-file': $ENOENT$
+  [1]
   $ mv ../tmp-docket .hg/store/00changelog.n
+  mv: cannot stat '../tmp-docket': $ENOENT$
+  [1]
 
 Check transaction related property
 ==================================
@@ -455,40 +560,32 @@
   $ echo dsljfl > a
   $ hg add a
   $ hg ci -m a
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5003
-  tip-node: a52c5079765b5865d97b993b303a18740113bbb2
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
   $ echo babar2 > babar
   $ hg ci -m 'babar2' --config "hooks.pretxnclose.nodemap-test=hg debugnodemap --metadata"
-  uid: ???????? (glob)
-  tip-rev: 5004
-  tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
   data-length: 121280 (pure !)
   data-length: 121280 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 192 (pure !)
   data-unused: 192 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.158% (pure !)
   data-unused: 0.158% (rust !)
-  data-unused: 0.000% (no-pure no-rust !)
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5004
-  tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
+  [255]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
   data-length: 121280 (pure !)
   data-length: 121280 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 192 (pure !)
   data-unused: 192 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.158% (pure !)
   data-unused: 0.158% (rust !)
-  data-unused: 0.000% (no-pure no-rust !)
+  [10]
 
 Another process does not see the pending nodemap content during run.
 
@@ -502,33 +599,27 @@
   $ sh "$RUNTESTDIR/testlib/wait-on-file" 20 sync-txn-pending && \
   > hg debugnodemap --metadata && \
   > sh "$RUNTESTDIR/testlib/wait-on-file" 20 sync-txn-close sync-repo-read
-  uid: ???????? (glob)
-  tip-rev: 5004
-  tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
+  file not created after 20 seconds: sync-txn-pending
   data-length: 121280 (pure !)
   data-length: 121280 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 192 (pure !)
   data-unused: 192 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.158% (pure !)
   data-unused: 0.158% (rust !)
-  data-unused: 0.000% (no-pure no-rust !)
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
   data-length: 121536 (pure !)
   data-length: 121536 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 448 (pure !)
   data-unused: 448 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.369% (pure !)
   data-unused: 0.369% (rust !)
-  data-unused: 0.000% (no-pure no-rust !)
+  [10]
 
   $ cat output.txt
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
 
 Check that a failing transaction will properly revert the data
 
@@ -536,29 +627,24 @@
   $ f --size --sha256 .hg/store/00changelog-*.nd
   .hg/store/00changelog-????????.nd: size=121536, sha256=bb414468d225cf52d69132e1237afba34d4346ee2eb81b505027e6197b107f03 (glob) (pure !)
   .hg/store/00changelog-????????.nd: size=121536, sha256=909ac727bc4d1c0fda5f7bff3c620c98bd4a2967c143405a1503439e33b377da (glob) (rust !)
-  .hg/store/00changelog-????????.nd: size=121088, sha256=342d36d30d86dde67d3cb6c002606c4a75bcad665595d941493845066d9c8ee0 (glob) (no-pure no-rust !)
+  .hg/store/00changelog-*.nd: file not found
   $ hg ci -m a3 --config "extensions.abort=$RUNTESTDIR/testlib/crash_transaction_late.py"
-  transaction abort!
-  rollback completed
-  abort: This is a late abort
-  [255]
-  $ hg debugnodemap --metadata
-  uid: ???????? (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
   data-length: 121536 (pure !)
   data-length: 121536 (rust !)
-  data-length: 121088 (no-pure no-rust !)
   data-unused: 448 (pure !)
   data-unused: 448 (rust !)
-  data-unused: 0 (no-pure no-rust !)
   data-unused: 0.369% (pure !)
   data-unused: 0.369% (rust !)
-  data-unused: 0.000% (no-pure no-rust !)
+  [10]
   $ f --size --sha256 .hg/store/00changelog-*.nd
   .hg/store/00changelog-????????.nd: size=121536, sha256=bb414468d225cf52d69132e1237afba34d4346ee2eb81b505027e6197b107f03 (glob) (pure !)
   .hg/store/00changelog-????????.nd: size=121536, sha256=909ac727bc4d1c0fda5f7bff3c620c98bd4a2967c143405a1503439e33b377da (glob) (rust !)
-  .hg/store/00changelog-????????.nd: size=121088, sha256=342d36d30d86dde67d3cb6c002606c4a75bcad665595d941493845066d9c8ee0 (glob) (no-pure no-rust !)
+  .hg/store/00changelog-*.nd: file not found
 
 Check that removing content does not confuse the nodemap
 --------------------------------------------------------
@@ -567,30 +653,97 @@
 
   $ echo aso > a
   $ hg ci -m a4
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg rollback
-  repository tip rolled back to revision 5005 (undo commit)
-  working directory now based on revision 5005
+  no rollback information available
+  [1]
   $ hg id -r .
-  90d5d3ba2fc4 tip
+  000000000000 tip
 
 removing data with strip
 
   $ echo aso > a
   $ hg ci -m a4
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg --config extensions.strip= strip -r . --no-backup
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg id -r . --traceback
-  90d5d3ba2fc4 tip
+  000000000000 tip
 
 (be a good citizen and regenerate the nodemap)
   $ hg debugupdatecaches
-  $ hg debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: share
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4025, in debugupdatecaches
+      repo.updatecaches(caches=repository.CACHES_ALL)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 241, in wrapper
+      return orig(repo.unfiltered(), *args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 2940, in updatecaches
+      for entry in self.store.walk():
+                   ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
 
 Check race condition when multiple process write new data to the repository
 ---------------------------------------------------------------------------
@@ -818,9 +971,14 @@
     - changelog
     - manifest
   
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ ls -1 .hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
   [1]
   $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
 
 
 upgrading
@@ -838,7 +996,7 @@
   generaldelta:       yes    yes     yes
   share-safe:         yes    yes     yes
   sparserevlog:       yes    yes     yes
-  persistent-nodemap:  no    yes      no
+  persistent-nodemap: yes    yes      no
   copies-sdc:          no     no      no
   revlog-v2:           no     no      no
   changelog-v2:        no     no      no
@@ -847,63 +1005,104 @@
   compression:        zstd   zstd    zstd (zstd !)
   compression-level:  default default default
   $ hg debugupgraderepo --run --no-backup --quiet
+     preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
+     preserved: dotencode, use-dirstate-v2, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd dirstate-v2 !)
+  $ ls -1 .hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
+  [1]
+
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
+
+Running unrelated upgrade
+
+  $ hg debugupgraderepo --run --no-backup --quiet --optimize re-delta-all
   upgrade will perform the following actions:
   
   requirements
-     preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
-     preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !)
-     preserved: dotencode, use-dirstate-v2, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd dirstate-v2 !)
-     added: persistent-nodemap
+     preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
+     preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !)
+     preserved: dotencode, use-dirstate-v2, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd dirstate-v2 !)
+  
+  optimisations: re-delta-all
   
   processed revlogs:
     - all-filelogs
     - changelog
     - manifest
   
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: share
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4074, in debugupgraderepo
+      return upgrade.upgraderepo(
+             ^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/upgrade.py", line 278, in upgraderepo
+      backuppath = upgrade_engine.upgrade(
+                   ^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/upgrade_utils/engine.py", line 511, in upgrade
+      _clonerevlogs(
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/upgrade_utils/engine.py", line 166, in _clonerevlogs
+      alldatafiles = list(srcrepo.store.walk())
+                     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
   $ ls -1 .hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
-
-  $ hg debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
-
-Running unrelated upgrade
-
-  $ hg debugupgraderepo --run --no-backup --quiet --optimize re-delta-all
-  upgrade will perform the following actions:
-  
-  requirements
-     preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
-     preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !)
-     preserved: dotencode, use-dirstate-v2, fncache, generaldelta, persistent-nodemap, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd dirstate-v2 !)
-  
-  optimisations: re-delta-all
-  
-  processed revlogs:
-    - all-filelogs
-    - changelog
-    - manifest
-  
-  $ ls -1 .hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
-
-  $ hg debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  [1]
+
+  $ hg debugnodemap --metadata
+  abort: cannot give path to non-revlog
+  [10]
 
 Persistent nodemap and local/streaming clone
 ============================================
@@ -917,17 +1116,10 @@
 
   $ hg clone --pull --quiet -U test-repo standard-clone
   $ ls -1 standard-clone/.hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
+  [1]
   $ hg -R standard-clone debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
+  [10]
 
 
 local clone
@@ -936,18 +1128,87 @@
 The persistent nodemap should exist after a streaming clone
 
   $ hg clone -U test-repo local-clone
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: share
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/hgext/share.py", line 161, in clone
+      return orig(ui, source, *args, **opts)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/commands.py", line 2035, in clone
+      r = hg.clone(
+          ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/hg.py", line 935, in clone
+      streamclone.local_copy(srcrepo, destrepo)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/streamclone.py", line 1142, in local_copy
+      entries = list(entries)
+                ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/streamclone.py", line 785, in _entries_walk
+      for entry in entries:
+                   ^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
   $ ls -1 local-clone/.hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
+  ls: cannot access 'local-clone/.hg/store/': $ENOENT$
+  [1]
   $ hg -R local-clone debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5005
-  tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: repository local-clone not found
+  [255]
 
 Test various corruption case
 ============================
@@ -959,22 +1220,20 @@
 
   $ hg clone --quiet --pull test-repo corruption-test-repo
   $ ls -1 corruption-test-repo/.hg/store/00changelog*
-  corruption-test-repo/.hg/store/00changelog-*.nd (glob)
-  corruption-test-repo/.hg/store/00changelog.d
-  corruption-test-repo/.hg/store/00changelog.i
-  corruption-test-repo/.hg/store/00changelog.n
+  ls: cannot access 'corruption-test-repo/.hg/store/00changelog*': $ENOENT$
+  [2]
   $ rm corruption-test-repo/.hg/store/00changelog*.nd
+  rm: cannot remove 'corruption-test-repo/.hg/store/00changelog*.nd': $ENOENT$
+  [1]
   $ hg log -R corruption-test-repo -r .
-  changeset:   5005:90d5d3ba2fc4
+  changeset:   -1:000000000000
   tag:         tip
-  user:        test
+  user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     a2
   
   $ ls -1 corruption-test-repo/.hg/store/00changelog*
-  corruption-test-repo/.hg/store/00changelog.d
-  corruption-test-repo/.hg/store/00changelog.i
-  corruption-test-repo/.hg/store/00changelog.n
+  ls: cannot access 'corruption-test-repo/.hg/store/00changelog*': $ENOENT$
+  [2]
 
 Truncated data file
 -------------------
@@ -984,30 +1243,31 @@
 rebuild the missing data
   $ hg -R corruption-test-repo debugupdatecache
   $ ls -1 corruption-test-repo/.hg/store/00changelog*
-  corruption-test-repo/.hg/store/00changelog-*.nd (glob)
-  corruption-test-repo/.hg/store/00changelog.d
-  corruption-test-repo/.hg/store/00changelog.i
-  corruption-test-repo/.hg/store/00changelog.n
+  ls: cannot access 'corruption-test-repo/.hg/store/00changelog*': $ENOENT$
+  [2]
 
 truncate the file
 
   $ datafilepath=`ls corruption-test-repo/.hg/store/00changelog*.nd`
+  ls: cannot access 'corruption-test-repo/.hg/store/00changelog*.nd': $ENOENT$
+  [2]
   $ f -s $datafilepath
-  corruption-test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
+  size=0
   $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp
-  10+0 records in
-  10+0 records out
-  * bytes * (glob)
+  dd: failed to open '': $ENOENT$
+  [1]
   $ mv $datafilepath-tmp $datafilepath
+  mv: missing file operand
+  Try 'mv --help' for more information.
+  [1]
   $ f -s $datafilepath
-  corruption-test-repo/.hg/store/00changelog-*.nd: size=10000 (glob)
+  size=0
 
 Check that Mercurial reaction to this event
 
   $ hg -R corruption-test-repo log -r . --traceback
-  changeset:   5005:90d5d3ba2fc4
+  changeset:   -1:000000000000
   tag:         tip
-  user:        test
+  user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     a2
-  
+  

ERROR: test-persistent-nodemap.t output changed
!# Ret was: 0 (test-persistent-nodemap.t) 
test-mq.t
test-mq.t ... # Test test-mq.t 
# Running sh "/tmp/hgtests.qiewis6n/child167/test-mq.t.sh" 
# Ret was: 0 (test-keyword.t) 
ok
test-convert-hg-svn.t
test-convert-hg-svn.t ... # Test test-convert-hg-svn.t 
# Timout reached for process 1081389 
# Running sh "/tmp/hgtests.qiewis6n/child168/test-convert-hg-svn.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-hg-svn.t) 
test-gendoc-de.t
test-gendoc-de.t ... # Test test-gendoc-de.t 
# Timout reached for process 1087597 
# Running sh "/tmp/hgtests.qiewis6n/child169/test-gendoc-de.t.sh" 
# Ret was: 0 (test-gendoc-de.t) 
ok
test-rename-merge2.t
test-rename-merge2.t ... # Test test-rename-merge2.t 
# Running sh "/tmp/hgtests.qiewis6n/child170/test-rename-merge2.t.sh" 
# Timout reached for process 1087608 
# Ret was: 0 (test-merge-criss-cross.t#newfilenode) 
ok
test-phases.t
test-phases.t ... # Timout reached for process 1086681 
# Test test-phases.t 
# Running sh "/tmp/hgtests.qiewis6n/child171/test-phases.t.sh" 
# Timout reached for process 1087271 
# Ret was: 0 (test-merge-criss-cross.t#old) 
ok
test-generaldelta.t
test-generaldelta.t ... # Test test-generaldelta.t 
# Running sh "/tmp/hgtests.qiewis6n/child172/test-generaldelta.t.sh" 
# Ret was: 0 (test-generaldelta.t) 
ok
test-subrepo-git.t
test-subrepo-git.t ... # Test test-subrepo-git.t 
# Timout reached for process 1088000 
# Running sh "/tmp/hgtests.qiewis6n/child173/test-subrepo-git.t.sh" 
skipped missing feature: git command line client
# Ret was: 80 (test-subrepo-git.t) 
test-lfs-serve-access.t
test-lfs-serve-access.t ... # Test test-lfs-serve-access.t 
# Timout reached for process 1088366 
# Running sh "/tmp/hgtests.qiewis6n/child174/test-lfs-serve-access.t.sh" 
# Timout reached for process 1088381 
# Ret was: 0 (test-lfs-serve-access.t) 
ok
test-subrepo-recursion.t
test-subrepo-recursion.t ... # Test test-subrepo-recursion.t 
# Running sh "/tmp/hgtests.qiewis6n/child175/test-subrepo-recursion.t.sh" 
# Timout reached for process 1087849 
# Ret was: 0 (test-phases.t) 
ok
test-check-format.t
test-check-format.t ... # Test test-check-format.t 
# Running sh "/tmp/hgtests.qiewis6n/child176/test-check-format.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-check-format.t) 
test-split.t#obsstore-off
test-split.t#obsstore-off ... # Test test-split.t#obsstore-off 
# Timout reached for process 1088959 
# Running sh "/tmp/hgtests.qiewis6n/child177/test-split.t-obsstore-off.sh" 
# Timout reached for process 1087644 
# Ret was: 0 (test-rename-merge2.t) 
ok
test-split.t#obsstore-on
test-split.t#obsstore-on ... # Test test-split.t#obsstore-on 
# Running sh "/tmp/hgtests.qiewis6n/child178/test-split.t-obsstore-on.sh" 
# Timout reached for process 1088796 
# Ret was: 0 (test-subrepo-recursion.t) 
ok
test-treemanifest.t
test-treemanifest.t ... # Test test-treemanifest.t 
# Running sh "/tmp/hgtests.qiewis6n/child179/test-treemanifest.t.sh" 
# Timout reached for process 1087424 
# Ret was: 0 (test-mq.t) 
ok
test-lfs-serve.t#lfsremote-off
test-lfs-serve.t#lfsremote-off ... # Test test-lfs-serve.t#lfsremote-off 
# Running sh "/tmp/hgtests.qiewis6n/child180/test-lfs-serve.t-lfsremote-off.sh" 
# Killing daemon process 1089732 
# Timout reached for process 1089389 

--- /<<PKGBUILDDIR>>/tests/test-treemanifest.t
+++ /<<PKGBUILDDIR>>/tests/test-treemanifest.t.err
@@ -193,23 +193,33 @@
   >   echo 0 > $d/b
   > done
   $ hg ci -Aqm initial
+  Bus error
+  [135]
 
   $ echo 1 > a
   $ echo 1 > dir1/a
   $ echo 1 > dir1/dir1/a
   $ hg ci -Aqm 'modify on branch 1'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg co 0
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 2 > b
   $ echo 2 > dir1/b
   $ echo 2 > dir1/dir1/b
   $ hg ci -Aqm 'modify on branch 2'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg merge 1
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  abort: unknown revision '1'
+  [10]
   $ hg ci -m 'merge of flat manifests to new flat manifest'
+  nothing changed
+  [1]
 
   $ cd ..
   $ hg -R repo-flat serve -p $HGPORT -d \
@@ -221,688 +231,9 @@
 
   $ hg clone --config experimental.treemanifest=1 \
   >   http://localhost:$HGPORT repo-mixed -r 1
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 14 changes to 11 files
-  new changesets 5b02a3e8db7e:581ef6037d8b
-  updating to branch default
-  11 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: unknown revision '1'
+  [255]
   $ cat port-0-errors.log
   $ cd repo-mixed
+  $TESTTMP.sh: 198: cd: can't cd to repo-mixed
   $ test -d .hg/store/meta
-  [1]
-  $ hg debugrequires | grep treemanifest
-  treemanifest
-
-Should be possible to push updates from flat to tree manifest repo
-
-  $ hg -R ../repo-flat push ssh://user@dummy/repo-mixed
-  pushing to ssh://user@dummy/repo-mixed
-  searching for changes
-  remote: adding changesets
-  remote: adding manifests
-  remote: adding file changes
-  remote: added 2 changesets with 3 changes to 3 files
-
-Commit should store revlog per directory
-
-  $ hg co 1
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo 3 > a
-  $ echo 3 > dir1/a
-  $ echo 3 > dir1/dir1/a
-  $ hg ci -m 'first tree'
-  created new head
-  $ find .hg/store/meta | sort
-  .hg/store/meta
-  .hg/store/meta/dir1
-  .hg/store/meta/dir1/00manifest.i
-  .hg/store/meta/dir1/dir1
-  .hg/store/meta/dir1/dir1/00manifest.i
-  .hg/store/meta/dir1/dir2
-  .hg/store/meta/dir1/dir2/00manifest.i
-  .hg/store/meta/dir2
-  .hg/store/meta/dir2/00manifest.i
-
-Merge of two trees
-
-  $ hg co 2
-  6 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg merge 1
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg ci -m 'merge of flat manifests to new tree manifest'
-  created new head
-  $ hg diff -r 3
-
-Parent of tree root manifest should be flat manifest, and two for merge
-
-  $ hg debugindex -m
-     rev linkrev       nodeid    p1-nodeid    p2-nodeid
-       0       0 40536115ed9e 000000000000 000000000000
-       1       1 f3376063c255 40536115ed9e 000000000000
-       2       2 5d9b9da231a2 40536115ed9e 000000000000
-       3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255
-       4       4 51e32a8c60ee f3376063c255 000000000000
-       5       5 cc5baa78b230 5d9b9da231a2 f3376063c255
-
-
-Status across flat/tree boundary should work
-
-  $ hg status --rev '.^' --rev .
-  M a
-  M dir1/a
-  M dir1/dir1/a
-
-
-Turning off treemanifest config has no effect
-
-  $ hg debugindex --dir dir1
-     rev linkrev       nodeid    p1-nodeid    p2-nodeid
-       0       4 064927a0648a 000000000000 000000000000
-       1       5 25ecb8cb8618 000000000000 000000000000
-  $ echo 2 > dir1/a
-  $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
-  $ hg debugindex --dir dir1
-     rev linkrev       nodeid    p1-nodeid    p2-nodeid
-       0       4 064927a0648a 000000000000 000000000000
-       1       5 25ecb8cb8618 000000000000 000000000000
-       2       6 5b16163a30c6 25ecb8cb8618 000000000000
-
-Stripping and recovering changes should work
-
-  $ hg st --change tip
-  M dir1/a
-  $ hg --config extensions.strip= strip tip
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
-  $ hg debugindex --dir dir1
-     rev linkrev       nodeid    p1-nodeid    p2-nodeid
-       0       4 064927a0648a 000000000000 000000000000
-       1       5 25ecb8cb8618 000000000000 000000000000
-
-#if repobundlerepo
-  $ hg incoming .hg/strip-backup/*
-  comparing with .hg/strip-backup/*-backup.hg (glob)
-  searching for changes
-  changeset:   6:51cfd7b1e13b
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     modify dir1/a
-  
-#endif
-
-  $ hg unbundle .hg/strip-backup/*
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets 51cfd7b1e13b (1 drafts)
-  (run 'hg update' to get a working copy)
-  $ hg --config extensions.strip= strip tip
-  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
-  $ hg unbundle -q .hg/strip-backup/*
-  $ hg debugindex --dir dir1
-     rev linkrev       nodeid    p1-nodeid    p2-nodeid
-       0       4 064927a0648a 000000000000 000000000000
-       1       5 25ecb8cb8618 000000000000 000000000000
-       2       6 5b16163a30c6 25ecb8cb8618 000000000000
-  $ hg st --change tip
-  M dir1/a
-
-Shelving and unshelving should work
-
-  $ echo foo >> dir1/a
-  $ hg shelve
-  shelved as default
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg unshelve
-  unshelving change 'default'
-  $ hg diff --nodates
-  diff -r 708a273da119 dir1/a
-  --- a/dir1/a
-  +++ b/dir1/a
-  @@ -1,1 +1,2 @@
-   1
-  +foo
-
-Pushing from treemanifest repo to an empty repo makes that a treemanifest repo
-
-  $ cd ..
-  $ hg init empty-repo
-  $ cat << EOF >> empty-repo/.hg/hgrc
-  > [experimental]
-  > changegroup3=yes
-  > EOF
-  $ hg debugrequires -R empty-repo | grep treemanifest
-  [1]
-  $ hg push -R repo -r 0 empty-repo
-  pushing to empty-repo
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 2 changes to 2 files
-  $ hg debugrequires -R empty-repo | grep treemanifest
-  treemanifest
-
-Pushing to an empty repo works
-
-  $ hg --config experimental.treemanifest=1 init clone
-  $ hg debugrequires -R clone | grep treemanifest
-  treemanifest
-  $ hg push -R repo clone
-  pushing to clone
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 11 changesets with 15 changes to 10 files (+3 heads)
-  $ hg debugrequires -R clone | grep treemanifest
-  treemanifest
-  $ hg -R clone verify -q
-
-Create deeper repo with tree manifests.
-
-  $ hg --config experimental.treemanifest=True init deeprepo
-  $ cd deeprepo
-
-  $ mkdir .A
-  $ mkdir b
-  $ mkdir b/bar
-  $ mkdir b/bar/orange
-  $ mkdir b/bar/orange/fly
-  $ mkdir b/foo
-  $ mkdir b/foo/apple
-  $ mkdir b/foo/apple/bees
-
-  $ touch .A/one.txt
-  $ touch .A/two.txt
-  $ touch b/bar/fruits.txt
-  $ touch b/bar/orange/fly/gnat.py
-  $ touch b/bar/orange/fly/housefly.txt
-  $ touch b/foo/apple/bees/flower.py
-  $ touch c.txt
-  $ touch d.py
-
-  $ hg ci -Aqm 'initial'
-
-  $ echo >> .A/one.txt
-  $ echo >> .A/two.txt
-  $ echo >> b/bar/fruits.txt
-  $ echo >> b/bar/orange/fly/gnat.py
-  $ echo >> b/bar/orange/fly/housefly.txt
-  $ echo >> b/foo/apple/bees/flower.py
-  $ echo >> c.txt
-  $ echo >> d.py
-  $ hg ci -Aqm 'second'
-
-We'll see that visitdir works by removing some treemanifest revlogs and running
-the files command with various parameters.
-
-Test files from the root.
-
-  $ hg files -r .
-  .A/one.txt
-  .A/two.txt
-  b/bar/fruits.txt
-  b/bar/orange/fly/gnat.py
-  b/bar/orange/fly/housefly.txt
-  b/foo/apple/bees/flower.py
-  c.txt
-  d.py
-
-Excludes with a glob should not exclude everything from the glob's root
-
-  $ hg files -r . -X 'b/fo?' b
-  b/bar/fruits.txt
-  b/bar/orange/fly/gnat.py
-  b/bar/orange/fly/housefly.txt
-  $ cp -R .hg/store .hg/store-copy
-
-Test files for a subdirectory.
-
-#if reporevlogstore
-  $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
-  $ hg files -r . b
-  b/bar/fruits.txt
-  b/bar/orange/fly/gnat.py
-  b/bar/orange/fly/housefly.txt
-  b/foo/apple/bees/flower.py
-  $ hg diff -r '.^' -r . --stat b
-   b/bar/fruits.txt              |  1 +
-   b/bar/orange/fly/gnat.py      |  1 +
-   b/bar/orange/fly/housefly.txt |  1 +
-   b/foo/apple/bees/flower.py    |  1 +
-   4 files changed, 4 insertions(+), 0 deletions(-)
-  $ cp -R .hg/store-copy/. .hg/store
-
-Test files with just includes and excludes.
-
-#if reporevlogstore
-  $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
-  $ rm -r .hg/store/meta/b/bar/orange/fly
-  $ rm -r .hg/store/meta/b/foo/apple/bees
-  $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
-  b/bar/fruits.txt
-  $ hg diff -r '.^' -r . --stat -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
-   b/bar/fruits.txt |  1 +
-   1 files changed, 1 insertions(+), 0 deletions(-)
-  $ cp -R .hg/store-copy/. .hg/store
-
-Test files for a subdirectory, excluding a directory within it.
-
-#if reporevlogstore
-  $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
-  $ rm -r .hg/store/meta/b/foo
-  $ hg files -r . -X path:b/foo b
-  b/bar/fruits.txt
-  b/bar/orange/fly/gnat.py
-  b/bar/orange/fly/housefly.txt
-  $ hg diff -r '.^' -r . --stat -X path:b/foo b
-   b/bar/fruits.txt              |  1 +
-   b/bar/orange/fly/gnat.py      |  1 +
-   b/bar/orange/fly/housefly.txt |  1 +
-   3 files changed, 3 insertions(+), 0 deletions(-)
-  $ cp -R .hg/store-copy/. .hg/store
-
-Test files for a sub directory, including only a directory within it, and
-including an unrelated directory.
-
-#if reporevlogstore
-  $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
-  $ rm -r .hg/store/meta/b/foo
-  $ hg files -r . -I path:b/bar/orange -I path:a b
-  b/bar/orange/fly/gnat.py
-  b/bar/orange/fly/housefly.txt
-  $ hg diff -r '.^' -r . --stat -I path:b/bar/orange -I path:a b
-   b/bar/orange/fly/gnat.py      |  1 +
-   b/bar/orange/fly/housefly.txt |  1 +
-   2 files changed, 2 insertions(+), 0 deletions(-)
-  $ cp -R .hg/store-copy/. .hg/store
-
-Test files for a pattern, including a directory, and excluding a directory
-within that.
-
-#if reporevlogstore
-  $ rm -r .hg/store/meta/~2e_a
-#endif
-#if reposimplestore
-  $ rm -r .hg/store/meta/._a
-#endif
-  $ rm -r .hg/store/meta/b/foo
-  $ rm -r .hg/store/meta/b/bar/orange
-  $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
-  b/bar/fruits.txt
-  $ hg diff -r '.^' -r . --stat glob:**.txt -I path:b/bar -X path:b/bar/orange
-   b/bar/fruits.txt |  1 +
-   1 files changed, 1 insertions(+), 0 deletions(-)
-  $ cp -R .hg/store-copy/. .hg/store
-
-Add some more changes to the deep repo
-  $ echo narf >> b/bar/fruits.txt
-  $ hg ci -m narf
-  $ echo troz >> b/bar/orange/fly/gnat.py
-  $ hg ci -m troz
-
-Verify works
-  $ hg verify -q
-
-#if repofncache
-Dirlogs are included in fncache
-  $ grep meta/.A/00manifest.i .hg/store/fncache
-  meta/.A/00manifest.i
-
-Rebuilt fncache includes dirlogs
-  $ rm .hg/store/fncache
-  $ hg debugrebuildfncache
-  adding data/.A/one.txt.i
-  adding data/.A/two.txt.i
-  adding data/b/bar/fruits.txt.i
-  adding data/b/bar/orange/fly/gnat.py.i
-  adding data/b/bar/orange/fly/housefly.txt.i
-  adding data/b/foo/apple/bees/flower.py.i
-  adding data/c.txt.i
-  adding data/d.py.i
-  adding meta/.A/00manifest.i
-  adding meta/b/00manifest.i
-  adding meta/b/bar/00manifest.i
-  adding meta/b/bar/orange/00manifest.i
-  adding meta/b/bar/orange/fly/00manifest.i
-  adding meta/b/foo/00manifest.i
-  adding meta/b/foo/apple/00manifest.i
-  adding meta/b/foo/apple/bees/00manifest.i
-  16 items added, 0 removed from fncache
-#endif
-
-Finish first server
-  $ killdaemons.py
-
-Back up the recently added revlogs
-  $ cp -R .hg/store .hg/store-newcopy
-
-Verify reports missing dirlog
-  $ rm .hg/store/meta/b/00manifest.*
-  $ hg verify
-  checking changesets
-  checking manifests
-  checking directory manifests
-   0: empty or missing b/
-   b/@0: parent-directory manifest refers to unknown revision 67688a370455
-   b/@1: parent-directory manifest refers to unknown revision f065da70369e
-   b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
-   b/@3: parent-directory manifest refers to unknown revision 367152e6af28
-  warning: orphan data file 'meta/b/bar/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/bar/orange/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/apple/00manifest.i' (reporevlogstore !)
-  warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i' (reporevlogstore !)
-  crosschecking files in changesets and manifests
-   b/bar/fruits.txt@0: in changeset but not in manifest
-   b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
-   b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest
-   b/foo/apple/bees/flower.py@0: in changeset but not in manifest
-  checking files
-  not checking dirstate because of previous errors
-  checked 4 changesets with 18 changes to 8 files
-  6 warnings encountered! (reporevlogstore !)
-  9 integrity errors encountered!
-  (first damaged changeset appears to be 0)
-  [1]
-  $ cp -R .hg/store-newcopy/. .hg/store
-
-Verify reports missing dirlog entry
-  $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/
-  $ hg verify
-  checking changesets
-  checking manifests
-  checking directory manifests
-   b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
-   b/@3: parent-directory manifest refers to unknown revision 367152e6af28
-   b/bar/@?: rev 2 points to unexpected changeset 2
-   b/bar/@?: 44d7e1146e0d not in parent-directory manifest
-   b/bar/@?: rev 3 points to unexpected changeset 3
-   b/bar/@?: 70b10c6b17b7 not in parent-directory manifest
-   b/bar/orange/@?: rev 2 points to unexpected changeset 3
-   (expected None)
-   b/bar/orange/fly/@?: rev 2 points to unexpected changeset 3
-   (expected None)
-  crosschecking files in changesets and manifests
-  checking files
-  not checking dirstate because of previous errors
-  checked 4 changesets with 18 changes to 8 files
-  2 warnings encountered!
-  8 integrity errors encountered!
-  (first damaged changeset appears to be 2)
-  [1]
-  $ cp -R .hg/store-newcopy/. .hg/store
-
-Test cloning a treemanifest repo over http.
-  $ cd ..
-  $ hg -R deeprepo serve -p $HGPORT -d \
-  >   --pid-file=port-0-hg.pid \
-  >   --errorlog=port-0-errors.log
-  $ cat port-0-hg.pid >> $DAEMON_PIDS
-
-We can clone even with the knob turned off and we'll get a treemanifest repo.
-  $ hg clone --config experimental.treemanifest=False \
-  >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT deepclone
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 4 changesets with 18 changes to 8 files
-  new changesets 775704be6f52:523e5c631710
-  updating to branch default
-  8 files updated, 0 files merged, 0 files removed, 0 files unresolved
-No server errors.
-  $ cat port-0-errors.log
-
-requires got updated to include treemanifest
-  $ hg debugrequires -R deepclone | grep treemanifest
-  treemanifest
-Tree manifest revlogs exist.
-  $ find deepclone/.hg/store/meta | sort
-  deepclone/.hg/store/meta
-  deepclone/.hg/store/meta/._a (reposimplestore !)
-  deepclone/.hg/store/meta/._a/00manifest.i (reposimplestore !)
-  deepclone/.hg/store/meta/b
-  deepclone/.hg/store/meta/b/00manifest.i
-  deepclone/.hg/store/meta/b/bar
-  deepclone/.hg/store/meta/b/bar/00manifest.i
-  deepclone/.hg/store/meta/b/bar/orange
-  deepclone/.hg/store/meta/b/bar/orange/00manifest.i
-  deepclone/.hg/store/meta/b/bar/orange/fly
-  deepclone/.hg/store/meta/b/bar/orange/fly/00manifest.i
-  deepclone/.hg/store/meta/b/foo
-  deepclone/.hg/store/meta/b/foo/00manifest.i
-  deepclone/.hg/store/meta/b/foo/apple
-  deepclone/.hg/store/meta/b/foo/apple/00manifest.i
-  deepclone/.hg/store/meta/b/foo/apple/bees
-  deepclone/.hg/store/meta/b/foo/apple/bees/00manifest.i
-  deepclone/.hg/store/meta/~2e_a (reporevlogstore !)
-  deepclone/.hg/store/meta/~2e_a/00manifest.i (reporevlogstore !)
-Verify passes.
-  $ cd deepclone
-  $ hg verify -q
-  $ cd ..
-
-#if reporevlogstore
-Create clones using old repo formats to use in later tests
-  $ hg clone --config format.usestore=False \
-  >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT deeprepo-basicstore
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 4 changesets with 18 changes to 8 files
-  new changesets 775704be6f52:523e5c631710
-  updating to branch default
-  8 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg -R deeprepo-basicstore debugrequires | grep store
-  [1]
-  $ hg -R deeprepo-basicstore serve -p $HGPORT1 -d \
-  >   --pid-file=port-1-hg.pid \
-  >   --errorlog=port-1-errors.log
-  $ cat port-1-hg.pid >> $DAEMON_PIDS
-
-  $ hg clone --config format.usefncache=False \
-  >   --config experimental.changegroup3=True \
-  >   http://localhost:$HGPORT deeprepo-encodedstore
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 4 changesets with 18 changes to 8 files
-  new changesets 775704be6f52:523e5c631710
-  updating to branch default
-  8 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg -R deeprepo-encodedstore debugrequires | grep fncache
-  [1]
-  $ hg -R deeprepo-encodedstore serve -p $HGPORT2 -d \
-  >   --pid-file=port-2-hg.pid \
-  >   --errorlog=port-2-errors.log
-  $ cat port-2-hg.pid >> $DAEMON_PIDS
-
-Local clone with basicstore
-  $ hg clone -U deeprepo-basicstore local-clone-basicstore
-  $ hg -R local-clone-basicstore verify -q
-
-Local clone with encodedstore
-  $ hg clone -U deeprepo-encodedstore local-clone-encodedstore
-  $ hg -R local-clone-encodedstore verify -q
-
-Local clone with fncachestore
-  $ hg clone -U deeprepo local-clone-fncachestore
-  $ hg -R local-clone-fncachestore verify -q
-
-Stream clone with basicstore
-  $ hg clone --config experimental.changegroup3=True --stream -U \
-  >   http://localhost:$HGPORT1 stream-clone-basicstore
-  streaming all changes
-  24 files to transfer, * of data (glob) (no-rust !)
-  26 files to transfer, * of data (glob) (rust !)
-  transferred * in * seconds (*) (glob)
-  $ hg -R stream-clone-basicstore verify -q
-  $ cat port-1-errors.log
-
-Stream clone with encodedstore
-  $ hg clone --config experimental.changegroup3=True --stream -U \
-  >   http://localhost:$HGPORT2 stream-clone-encodedstore
-  streaming all changes
-  24 files to transfer, * of data (glob) (no-rust !)
-  26 files to transfer, * of data (glob) (rust !)
-  transferred * in * seconds (*) (glob)
-  $ hg -R stream-clone-encodedstore verify -q
-  $ cat port-2-errors.log
-
-Stream clone with fncachestore
-  $ hg clone --config experimental.changegroup3=True --stream -U \
-  >   http://localhost:$HGPORT stream-clone-fncachestore
-  streaming all changes
-  23 files to transfer, * of data (glob) (no-rust !)
-  25 files to transfer, * of data (glob) (rust !)
-  transferred * in * seconds (*) (glob)
-  $ hg -R stream-clone-fncachestore verify -q
-  $ cat port-0-errors.log
-
-Packed bundle
-  $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg
-  writing 5330 bytes for 19 files (no-zstd !)
-  writing 5400 bytes for 19 files (zstd no-rust !)
-  writing 5654 bytes for 21 files (zstd rust !)
-  bundle requirements:.* treemanifest(,.*)? (re)
-  $ hg debugbundle --spec repo-packed.hg
-  none-packed1;requirements%3D(.*%2C)?treemanifest(%2C.*)? (re)
-
-#endif
-
-Bundle with changegroup2 is not supported
-
-  $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
-  abort: repository does not support bundle version 02
-  [255]
-
-Pull does not include changegroup for manifest the client already has from
-other branch
-
-  $ mkdir grafted-dir-repo
-  $ cd grafted-dir-repo
-  $ hg --config experimental.treemanifest=1 init
-  $ mkdir dir
-  $ echo a > dir/file
-  $ echo a > file
-  $ hg ci -Am initial
-  adding dir/file
-  adding file
-  $ echo b > dir/file
-  $ hg ci -m updated
-  $ hg co '.^'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg revert -r tip dir/
-  reverting dir/file
-  $ echo b > file # to make sure root manifest is sent
-  $ hg ci -m grafted
-  created new head
-  $ cd ..
-
-  $ hg --config experimental.treemanifest=1 clone --pull -r 1 \
-  >   grafted-dir-repo grafted-dir-repo-clone
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 3 changes to 2 files
-  new changesets d84f4c419457:09ab742f3b0f
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ cd grafted-dir-repo-clone
-  $ hg pull -r 2
-  pulling from $TESTTMP/grafted-dir-repo
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  new changesets 73699489fb7c
-  (run 'hg heads' to see heads, 'hg merge' to merge)
-
-Committing a empty commit does not duplicate root treemanifest
-  $ echo z >> z
-  $ hg commit -Aqm 'pre-empty commit'
-  $ hg rm z
-  $ hg commit --amend -m 'empty commit'
-  saved backup bundle to $TESTTMP/grafted-dir-repo-clone/.hg/strip-backup/cb99d5717cea-9e3b6b02-amend.hg
-  $ hg log -r 'tip + tip^' -T '{manifest}\n'
-  1:678d3574b88c
-  1:678d3574b88c
-  $ hg --config extensions.strip= strip -r . -q
-
-Testing repository upgrade
---------------------------
-
-  $ for x in 1 2 3 4 5 6 7 8 9; do
-  >    echo $x > file-$x # make sure we have interresting compression
-  >    echo $x > dir/foo-$x # make sure we have interresting compression
-  >    hg add file-$x
-  >    hg add dir/foo-$x
-  > done
-  $ hg ci -m 'have some content'
-  $ f -s .hg/store/00manifest.*
-  .hg/store/00manifest.i: size=798 (no-pure !)
-  .hg/store/00manifest.i: size=784 (pure !)
-  $ f -s .hg/store/meta/dir/00manifest*
-  .hg/store/meta/dir/00manifest.i: size=556 (no-pure !)
-  .hg/store/meta/dir/00manifest.i: size=544 (pure !)
-  $ hg debugupgraderepo --config format.revlog-compression=none --config experimental.treemanifest=yes --run --quiet --no-backup
-  upgrade will perform the following actions:
-  
-  requirements
-     preserved: * (glob)
-     removed: revlog-compression-zstd (no-pure !)
-     added: exp-compression-none
-  
-  processed revlogs:
-    - all-filelogs
-    - changelog
-    - manifest
-  
-  $ hg verify
-  checking changesets
-  checking manifests
-  checking directory manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 4 changesets with 22 changes to 20 files
-  $ f -s .hg/store/00manifest.*
-  .hg/store/00manifest.i: size=1002
-  $ f -s .hg/store/meta/dir/00manifest*
-  .hg/store/meta/dir/00manifest.i: size=721
-  $ hg files --rev tip | wc -l
-  \s*20 (re)
-
-testing cache update warming persistent nodemaps
-------------------------------------------------
-
-  $ hg debugupdatecache

ERROR: test-treemanifest.t output changed
!# Ret was: 1 (test-treemanifest.t) 
test-lfs-serve.t#lfsremote-on
test-lfs-serve.t#lfsremote-on ... # Test test-lfs-serve.t#lfsremote-on 
# Running sh "/tmp/hgtests.qiewis6n/child181/test-lfs-serve.t-lfsremote-on.sh" 
# Ret was: 0 (test-split.t#obsstore-off) 
ok
test-transplant.t#commandmode
test-transplant.t#commandmode ... # Test test-transplant.t#commandmode 
# Timout reached for process 1088975 
# Running sh "/tmp/hgtests.qiewis6n/child182/test-transplant.t-commandmode.sh" 
# Ret was: 0 (test-lfs-serve.t#lfsremote-off) 
ok
test-transplant.t#continueflag
test-transplant.t#continueflag ... # Test test-transplant.t#continueflag 
# Timout reached for process 1089665 
# Running sh "/tmp/hgtests.qiewis6n/child183/test-transplant.t-continueflag.sh" 
# Timout reached for process 1089296 
# Ret was: 0 (test-split.t#obsstore-on) 
ok
test-dirstate-race2.t#dirstate-v1
test-dirstate-race2.t#dirstate-v1 ... # Test test-dirstate-race2.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child184/test-dirstate-race2.t-dirstate-v1.sh" 
# Ret was: 0 (test-dirstate-race2.t#dirstate-v1) 
ok
test-dirstate-race2.t#dirstate-v2
test-dirstate-race2.t#dirstate-v2 ... # Test test-dirstate-race2.t#dirstate-v2 
# Timout reached for process 1090118 
# Running sh "/tmp/hgtests.qiewis6n/child185/test-dirstate-race2.t-dirstate-v2.sh" 
# Ret was: 0 (test-dirstate-race2.t#dirstate-v2) 
ok
test-https.t
test-https.t ... # Test test-https.t 
# Timout reached for process 1090240 
# Running sh "/tmp/hgtests.qiewis6n/child186/test-https.t.sh" 
# Timout reached for process 1089771 
# Ret was: 0 (test-lfs-serve.t#lfsremote-on) 
ok
test-notify.t
test-notify.t ... # Test test-notify.t 
# Running sh "/tmp/hgtests.qiewis6n/child187/test-notify.t.sh" 
# Timout reached for process 1090552 
# Ret was: 0 (test-notify.t) 
ok
test-http-protocol.t
test-http-protocol.t ... # Test test-http-protocol.t 
# Running sh "/tmp/hgtests.qiewis6n/child188/test-http-protocol.t.sh" 
# Timout reached for process 1089789 
# Ret was: 0 (test-transplant.t#commandmode) 
ok
test-template-basic.t
test-template-basic.t ... # Test test-template-basic.t 
# Running sh "/tmp/hgtests.qiewis6n/child189/test-template-basic.t.sh" 
# Timout reached for process 1090406 
# Killing daemon process 1090954 
# Killing daemon process 1090962 
# Killing daemon process 1091133 
# Daemon process 1091133 is stuck - really killing it 
# Ret was: 0 (test-https.t) 
ok
test-tag.t
test-tag.t ... # Test test-tag.t 
# Running sh "/tmp/hgtests.qiewis6n/child190/test-tag.t.sh" 
# Timout reached for process 1090900 
# Killing daemon process 1091265 
# Daemon process 1091265 is stuck - really killing it 
# Ret was: 0 (test-http-protocol.t) 
ok
test-convert.t
test-convert.t ... # Test test-convert.t 
# Running sh "/tmp/hgtests.qiewis6n/child191/test-convert.t.sh" 
# Ret was: 0 (test-transplant.t#continueflag) 
ok
test-hgweb.t
test-hgweb.t ... # Test test-hgweb.t 
# Timout reached for process 1090018 
# Running sh "/tmp/hgtests.qiewis6n/child192/test-hgweb.t.sh" 
# Timout reached for process 1091304 
# Ret was: 0 (test-convert.t) 
ok
test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v1
test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v1 ... # Test test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child193/test-shelve2.t-phasebased-abortcommand-continuecommand-dirstate-v1.sh" 
# Ret was: 0 (test-hgweb.t) 
ok
test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v2
test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v2 ... # Test test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v2 
# Timout reached for process 1091406 
# Running sh "/tmp/hgtests.qiewis6n/child194/test-shelve2.t-phasebased-abortcommand-continuecommand-dirstate-v2.sh" 
# Ret was: 0 (test-tag.t) 
ok
test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v1
test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v1 ... # Test test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v1 
# Timout reached for process 1091200 
# Running sh "/tmp/hgtests.qiewis6n/child195/test-shelve2.t-phasebased-abortcommand-continueflag-dirstate-v1.sh" 
# Timout reached for process 1091184 
# Ret was: 0 (test-template-basic.t) 
ok
test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v2
test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v2 ... # Test test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child196/test-shelve2.t-phasebased-abortcommand-continueflag-dirstate-v2.sh" 
# Timout reached for process 1091586 
# Ret was: 0 (test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v1) 
ok
test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v1
test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v1 ... # Test test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child197/test-shelve2.t-phasebased-abortflag-continuecommand-dirstate-v1.sh" 
# Timout reached for process 1091829 
# Ret was: 0 (test-shelve2.t#phasebased#abortcommand#continuecommand#dirstate-v2) 
ok
test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v2
test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v2 ... # Test test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child198/test-shelve2.t-phasebased-abortflag-continuecommand-dirstate-v2.sh" 
# Ret was: 0 (test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v1) 
ok
test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v1
test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v1 ... # Test test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v1 
# Timout reached for process 1092243 
# Running sh "/tmp/hgtests.qiewis6n/child199/test-shelve2.t-phasebased-abortflag-continueflag-dirstate-v1.sh" 
# Ret was: 0 (test-shelve2.t#phasebased#abortcommand#continueflag#dirstate-v2) 
ok
test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v2
test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v2 ... # Test test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v2 
# Timout reached for process 1092524 
# Running sh "/tmp/hgtests.qiewis6n/child200/test-shelve2.t-phasebased-abortflag-continueflag-dirstate-v2.sh" 
# Ret was: 0 (test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v1) 
ok
test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v1
test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v1 ... # Test test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v1 
# Timout reached for process 1092963 
# Running sh "/tmp/hgtests.qiewis6n/child201/test-shelve2.t-stripbased-abortcommand-continuecommand-dirstate-v1.sh" 
# Ret was: 0 (test-shelve2.t#phasebased#abortflag#continuecommand#dirstate-v2) 
ok
test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v2
test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v2 ... # Test test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v2 
# Timout reached for process 1093134 
# Running sh "/tmp/hgtests.qiewis6n/child202/test-shelve2.t-stripbased-abortcommand-continuecommand-dirstate-v2.sh" 
# Timout reached for process 1093476 
# Ret was: 0 (test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v1) 
ok
test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v1
test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v1 ... # Test test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child203/test-shelve2.t-stripbased-abortcommand-continueflag-dirstate-v1.sh" 
# Timout reached for process 1093781 
# Ret was: 0 (test-shelve2.t#phasebased#abortflag#continueflag#dirstate-v2) 
ok
test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v2
test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v2 ... # Test test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child204/test-shelve2.t-stripbased-abortcommand-continueflag-dirstate-v2.sh" 
# Timout reached for process 1094182 
# Ret was: 0 (test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v1) 
ok
test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v1
test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v1 ... # Test test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child205/test-shelve2.t-stripbased-abortflag-continuecommand-dirstate-v1.sh" 
# Timout reached for process 1094367 
# Ret was: 0 (test-shelve2.t#stripbased#abortcommand#continuecommand#dirstate-v2) 
ok
test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v2
test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v2 ... # Test test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child206/test-shelve2.t-stripbased-abortflag-continuecommand-dirstate-v2.sh" 
# Timout reached for process 1094683 
# Ret was: 0 (test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v1) 
ok
test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v1
test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v1 ... # Test test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child207/test-shelve2.t-stripbased-abortflag-continueflag-dirstate-v1.sh" 
# Timout reached for process 1095000 
# Ret was: 0 (test-shelve2.t#stripbased#abortcommand#continueflag#dirstate-v2) 
ok
test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v2
test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v2 ... # Test test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child208/test-shelve2.t-stripbased-abortflag-continueflag-dirstate-v2.sh" 
# Ret was: 0 (test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v1) 
ok
test-http.t
test-http.t ... # Test test-http.t 
# Timout reached for process 1095363 
# Running sh "/tmp/hgtests.qiewis6n/child209/test-http.t.sh" 
# Ret was: 0 (test-shelve2.t#stripbased#abortflag#continuecommand#dirstate-v2) 
ok
test-check-jshint.t
test-check-jshint.t ... # Test test-check-jshint.t 
# Timout reached for process 1095565 
# Running sh "/tmp/hgtests.qiewis6n/child210/test-check-jshint.t.sh" 
skipped missing feature: JSHint static code analysis tool
# Ret was: 80 (test-check-jshint.t) 
test-annotate.t
test-annotate.t ... # Test test-annotate.t 
# Timout reached for process 1096866 
# Running sh "/tmp/hgtests.qiewis6n/child211/test-annotate.t.sh" 
# Timout reached for process 1096612 
# Killing daemon process 1097042 
# Ret was: 0 (test-http.t) 
ok
test-obsolete-distributed.t
test-obsolete-distributed.t ... # Test test-obsolete-distributed.t 
# Running sh "/tmp/hgtests.qiewis6n/child212/test-obsolete-distributed.t.sh" 
# Timout reached for process 1095874 
# Ret was: 0 (test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v1) 
ok
test-rebase-inmemory.t
test-rebase-inmemory.t ... # Test test-rebase-inmemory.t 
# Running sh "/tmp/hgtests.qiewis6n/child213/test-rebase-inmemory.t.sh" 
# Ret was: 0 (test-shelve2.t#stripbased#abortflag#continueflag#dirstate-v2) 
ok
test-obsolete-divergent.t
test-obsolete-divergent.t ... # Test test-obsolete-divergent.t 
# Timout reached for process 1096254 
# Running sh "/tmp/hgtests.qiewis6n/child214/test-obsolete-divergent.t.sh" 
# Ret was: 0 (test-obsolete-distributed.t) 
ok
test-convert-filemap.t
test-convert-filemap.t ... # Test test-convert-filemap.t 
# Timout reached for process 1097114 
# Running sh "/tmp/hgtests.qiewis6n/child215/test-convert-filemap.t.sh" 
# Timout reached for process 1096875 
# Ret was: 0 (test-annotate.t) 
ok
test-walk.t
test-walk.t ... # Test test-walk.t 
# Running sh "/tmp/hgtests.qiewis6n/child216/test-walk.t.sh" 
# Timout reached for process 1097190 
# Ret was: 0 (test-rebase-inmemory.t) 
ok
test-graft.t
test-graft.t ... # Test test-graft.t 
# Running sh "/tmp/hgtests.qiewis6n/child217/test-graft.t.sh" 
# Ret was: 0 (test-walk.t) 
ok
test-bisect.t
test-bisect.t ... # Test test-bisect.t 
# Running sh "/tmp/hgtests.qiewis6n/child218/test-bisect.t.sh" 
# Timout reached for process 1098006 
# Ret was: 0 (test-obsolete-divergent.t) 
ok
test-stabletailgraph.t
test-stabletailgraph.t ... # Test test-stabletailgraph.t 
# Running sh "/tmp/hgtests.qiewis6n/child219/test-stabletailgraph.t.sh" 
# Timout reached for process 1097515 
# Timout reached for process 1097631 
# Ret was: 0 (test-convert-filemap.t) 
ok
test-encoding-textwrap.t
test-encoding-textwrap.t ... # Test test-encoding-textwrap.t 
# Running sh "/tmp/hgtests.qiewis6n/child220/test-encoding-textwrap.t.sh" 
# Ret was: 0 (test-encoding-textwrap.t) 
ok
test-mv-cp-st-diff.t
test-mv-cp-st-diff.t ... # Test test-mv-cp-st-diff.t 
# Running sh "/tmp/hgtests.qiewis6n/child221/test-mv-cp-st-diff.t.sh" 
# Timout reached for process 1098622 
# Ret was: 0 (test-graft.t) 
ok
test-resolve.t
test-resolve.t ... # Test test-resolve.t 
# Running sh "/tmp/hgtests.qiewis6n/child222/test-resolve.t.sh" 
# Timout reached for process 1098365 
# Timout reached for process 1098616 
# Ret was: 0 (test-stabletailgraph.t) 
ok
test-convert-p4-filetypes.t
test-convert-p4-filetypes.t ... # Test test-convert-p4-filetypes.t 
# Running sh "/tmp/hgtests.qiewis6n/child223/test-convert-p4-filetypes.t.sh" 
skipped missing feature: Perforce server and client
# Ret was: 80 (test-convert-p4-filetypes.t) 
test-devel-warnings.t
test-devel-warnings.t ... # Test test-devel-warnings.t 
# Timout reached for process 1099195 
# Running sh "/tmp/hgtests.qiewis6n/child224/test-devel-warnings.t.sh" 
# Timout reached for process 1099214 
# Ret was: 0 (test-devel-warnings.t) 
ok
test-rebase-scenario-global.t
test-rebase-scenario-global.t ... # Test test-rebase-scenario-global.t 
# Running sh "/tmp/hgtests.qiewis6n/child225/test-rebase-scenario-global.t.sh" 
# Ret was: 0 (test-bisect.t) 
ok
test-commit.t
test-commit.t ... # Test test-commit.t 
# Timout reached for process 1098444 
# Running sh "/tmp/hgtests.qiewis6n/child226/test-commit.t.sh" 
# Ret was: 0 (test-mv-cp-st-diff.t) 
ok
test-ssh.t
test-ssh.t ... # Test test-ssh.t 
# Timout reached for process 1098677 
# Running sh "/tmp/hgtests.qiewis6n/child227/test-ssh.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-resolve.t
+++ /<<PKGBUILDDIR>>/tests/test-resolve.t.err
@@ -467,35 +467,23 @@
 
   $ for emp in emp1 emp2 emp3; do echo nowork > $emp; done;
   $ hg ci -Aqm "added lazy emp1 emp2 emp3"
+  Bus error
+  [135]
 
   $ hg log -GT "{rev} {node|short} {firstline(desc)}\n"
-  @  2 0acfd4a49af0 added lazy emp1 emp2 emp3
+  o  1 f30f98a8181f added emp1 emp2 emp3
   |
-  | o  1 f30f98a8181f added emp1 emp2 emp3
-  |/
-  o  0 88660038d466 add boss
+  @  0 88660038d466 add boss
   
   $ hg rebase -s 1 -d 2
-  rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
-  merging emp1
-  warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
-  merging emp2
-  warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
-  merging emp3
-  warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
-  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [240]
+  abort: unknown revision '2'
+  [10]
 
 Test when commands.resolve.confirm config option is not set:
 ===========================================================
   $ hg resolve --all
-  merging emp1
-  warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
-  merging emp2
-  warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
-  merging emp3
-  warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
-  [1]
+  abort: resolve command not applicable when not merging
+  [20]
 
 Test when config option is set:
 ==============================
@@ -521,22 +509,16 @@
   > y
   > EOF
   re-merge all unresolved files (yn)? y
-  merging emp1
-  warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
-  merging emp2
-  warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
-  merging emp3
-  warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
-  [1]
+  abort: resolve command not applicable when not merging
+  [20]
 
 Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):
 ===============================================================================================
 
   $ hg resolve -m emp1
-  $ hg resolve -l
-  R emp1
-  U emp2
-  U emp3
+  abort: resolve command not applicable when not merging
+  [20]
+  $ hg resolve -l
 
   $ hg resolve -m << EOF
   > n
@@ -549,22 +531,18 @@
   > y
   > EOF
   mark all unresolved files as resolved (yn)? y
-  (no more unresolved files)
-  continue: hg rebase --continue
-  $ hg resolve -l
-  R emp1
-  R emp2
-  R emp3
+  abort: resolve command not applicable when not merging
+  [20]
+  $ hg resolve -l
 
 Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given):
 =================================================================================================
 
   $ hg resolve -u emp1
-
-  $ hg resolve -l
-  U emp1
-  R emp2
-  R emp3
+  abort: resolve command not applicable when not merging
+  [20]
+
+  $ hg resolve -l
 
   $ hg resolve -u << EOF
   > n
@@ -577,16 +555,14 @@
   > y
   > EOF
   mark all unresolved files as resolved (yn)? y
-  (no more unresolved files)
-  continue: hg rebase --continue
-
-  $ hg resolve -l
-  R emp1
-  R emp2
-  R emp3
+  abort: resolve command not applicable when not merging
+  [20]
+
+  $ hg resolve -l
 
   $ hg rebase --abort
-  rebase aborted
+  abort: no rebase in progress
+  [20]
 
 Done with commands.resolve.confirm tests:
   $ cd ..

ERROR: test-resolve.t output changed
!# Ret was: 0 (test-resolve.t) 
test-bundle2-remote-changegroup.t
test-bundle2-remote-changegroup.t ... # Test test-bundle2-remote-changegroup.t 
# Running sh "/tmp/hgtests.qiewis6n/child228/test-bundle2-remote-changegroup.t.sh" 
# Timout reached for process 1099150 
# Timout reached for process 1099423 
# Ret was: 0 (test-commit.t) 
ok
test-bundle-type.t
test-bundle-type.t ... # Test test-bundle-type.t 
# Running sh "/tmp/hgtests.qiewis6n/child229/test-bundle-type.t.sh" 
# Timout reached for process 1099355 
# Ret was: 0 (test-rebase-scenario-global.t) 
ok
test-import-git.t
test-import-git.t ... # Test test-import-git.t 
# Running sh "/tmp/hgtests.qiewis6n/child230/test-import-git.t.sh" 
# Timout reached for process 1099715 
# Ret was: 0 (test-ssh.t) 
ok
test-bisect2.t
test-bisect2.t ... # Test test-bisect2.t 
# Running sh "/tmp/hgtests.qiewis6n/child231/test-bisect2.t.sh" 
# Timout reached for process 1100097 
# Ret was: 0 (test-bundle2-remote-changegroup.t) 
ok
test-narrow-widen-linkrev-computation.t
test-narrow-widen-linkrev-computation.t ... # Test test-narrow-widen-linkrev-computation.t 
# Running sh "/tmp/hgtests.qiewis6n/child232/test-narrow-widen-linkrev-computation.t.sh" 
# Timout reached for process 1100301 
# Ret was: 0 (test-import-git.t) 
ok
test-mq-header-from.t
test-mq-header-from.t ... # Test test-mq-header-from.t 
# Running sh "/tmp/hgtests.qiewis6n/child233/test-mq-header-from.t.sh" 
# Timout reached for process 1100190 
# Ret was: 0 (test-bundle-type.t) 
ok
test-i18n.t
test-i18n.t ... # Test test-i18n.t 
# Running sh "/tmp/hgtests.qiewis6n/child234/test-i18n.t.sh" 
# Ret was: 0 (test-i18n.t) 
ok
test-archive.t
test-archive.t# Timout reached for process 1100989 
 ... # Test test-archive.t 
# Running sh "/tmp/hgtests.qiewis6n/child235/test-archive.t.sh" 
# Ret was: 0 (test-bisect2.t) 
ok
test-censor.t#revlogv1
test-censor.t#revlogv1 ... # Test test-censor.t#revlogv1 
# Timout reached for process 1100626 
# Running sh "/tmp/hgtests.qiewis6n/child236/test-censor.t-revlogv1.sh" 
# Timout reached for process 1100654 
# Ret was: 0 (test-narrow-widen-linkrev-computation.t) 
ok
test-censor.t#revlogv2
test-censor.t#revlogv2 ... # Test test-censor.t#revlogv2 
# Running sh "/tmp/hgtests.qiewis6n/child237/test-censor.t-revlogv2.sh" 
# Timout reached for process 1101048 
# Ret was: 0 (test-archive.t) 
ok
test-status.t#dirstate-v1
test-status.t#dirstate-v1 ... # Test test-status.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child238/test-status.t-dirstate-v1.sh" 
# Ret was: 0 (test-mq-header-from.t) 
ok
test-status.t#dirstate-v2
test-status.t#dirstate-v2 ... # Test test-status.t#dirstate-v2 
# Timout reached for process 1100917 
# Running sh "/tmp/hgtests.qiewis6n/child239/test-status.t-dirstate-v2.sh" 
# Timout reached for process 1101455 
# Ret was: 0 (test-censor.t#revlogv1) 
ok
test-treediscovery.t
test-treediscovery.t ... # Test test-treediscovery.t 
# Running sh "/tmp/hgtests.qiewis6n/child240/test-treediscovery.t.sh" 
# Ret was: 0 (test-censor.t#revlogv2) 
ok
test-rebase-obsolete.t
test-rebase-obsolete.t ... # Test test-rebase-obsolete.t 
# Running sh "/tmp/hgtests.qiewis6n/child241/test-rebase-obsolete.t.sh" 
# Timout reached for process 1101745 
# Ret was: 0 (test-status.t#dirstate-v1) 
ok
test-exchange-multi-source.t
test-exchange-multi-source.t ... # Test test-exchange-multi-source.t 
# Running sh "/tmp/hgtests.qiewis6n/child242/test-exchange-multi-source.t.sh" 
# Timout reached for process 1101835 
# Ret was: 0 (test-status.t#dirstate-v2) 
ok
test-issue6528.t
test-issue6528.t ... # Test test-issue6528.t 
# Running sh "/tmp/hgtests.qiewis6n/child243/test-issue6528.t.sh" 
# Timout reached for process 1102223 
# Ret was: 0 (test-treediscovery.t) 
ok
test-fileset.t
test-fileset.t ... # Test test-fileset.t 
# Timout reached for process 1102478 
# Running sh "/tmp/hgtests.qiewis6n/child244/test-fileset.t.sh" 
# Ret was: 0 (test-exchange-multi-source.t) 
ok
test-share-safe.t
test-share-safe.t ... # Test test-share-safe.t 
# Timout reached for process 1102835 
# Running sh "/tmp/hgtests.qiewis6n/child245/test-share-safe.t.sh" 
# Ret was: 0 (test-rebase-obsolete.t) 
ok
test-sparse-revlog.t
test-sparse-revlog.t ... # Test test-sparse-revlog.t 
# Timout reached for process 1102803 
# Running sh "/tmp/hgtests.qiewis6n/child246/test-sparse-revlog.t.sh" 
skipped missing artifact, run "/<<PKGBUILDDIR>>/tests/artifacts/scripts/generate-churning-bundle.py"
# Ret was: 80 (test-sparse-revlog.t) 
test-push-warn.t
test-push-warn.t ... # Test test-push-warn.t 
# Running sh "/tmp/hgtests.qiewis6n/child247/test-push-warn.t.sh" 
# Timout reached for process 1103305 
# Timout reached for process 1103141 
# Ret was: 0 (test-issue6528.t) 
ok
test-hgweb-annotate-whitespace.t
test-hgweb-annotate-whitespace.t ... # Test test-hgweb-annotate-whitespace.t 
# Running sh "/tmp/hgtests.qiewis6n/child248/test-hgweb-annotate-whitespace.t.sh" 
# Timout reached for process 1103238 
# Ret was: 0 (test-share-safe.t) 
ok
test-log-linerange.t
test-log-linerange.t ... # Test test-log-linerange.t 
# Running sh "/tmp/hgtests.qiewis6n/child249/test-log-linerange.t.sh" 
# Killing daemon process 1103655 
# Timout reached for process 1103595 
# Daemon process 1103655 is stuck - really killing it 
# Killing daemon process 1103667 
# Daemon process 1103667 is stuck - really killing it 
# Ret was: 0 (test-hgweb-annotate-whitespace.t) 
ok
test-graft-interrupted.t#abortcommand
test-graft-interrupted.t#abortcommand ... # Test test-graft-interrupted.t#abortcommand 
# Running sh "/tmp/hgtests.qiewis6n/child250/test-graft-interrupted.t-abortcommand.sh" 
# Ret was: 0 (test-log-linerange.t) 
ok
test-graft-interrupted.t#abortflag
test-graft-interrupted.t#abortflag ... # Test test-graft-interrupted.t#abortflag 
# Timout reached for process 1103706 
# Running sh "/tmp/hgtests.qiewis6n/child251/test-graft-interrupted.t-abortflag.sh" 
# Ret was: 0 (test-fileset.t) 
ok
test-remotefilelog-repack.t
test-remotefilelog-repack.t ... # Test test-remotefilelog-repack.t 
# Timout reached for process 1103194 
# Running sh "/tmp/hgtests.qiewis6n/child252/test-remotefilelog-repack.t.sh" 
# Timout reached for process 1103310 
# Ret was: 0 (test-push-warn.t) 
ok
test-update-branches.t
test-update-branches.t ... # Test test-update-branches.t 
# Running sh "/tmp/hgtests.qiewis6n/child253/test-update-branches.t.sh" 
# Ret was: 0 (test-graft-interrupted.t#abortcommand) 
ok
test-remove.t
test-remove.t ... # Test test-remove.t 
# Running sh "/tmp/hgtests.qiewis6n/child254/test-remove.t.sh" 
# Timout reached for process 1103729 
# Ret was: 0 (test-graft-interrupted.t#abortflag) 
ok
test-backout.t
test-backout.t ... # Test test-backout.t 
# Running sh "/tmp/hgtests.qiewis6n/child255/test-backout.t.sh" 
# Timout reached for process 1103951 
# Ret was: 0 (test-remotefilelog-repack.t) 
ok
test-graft-rename.t
test-graft-rename.t ... # Test test-graft-rename.t 
# Running sh "/tmp/hgtests.qiewis6n/child256/test-graft-rename.t.sh" 
# Timout reached for process 1104096 
# Ret was: 0 (test-remove.t) 
ok
test-clone-stream.t#stream-bundle2-v2
test-clone-stream.t#stream-bundle2-v2 ... # Test test-clone-stream.t#stream-bundle2-v2 
# Timout reached for process 1104384 
# Running sh "/tmp/hgtests.qiewis6n/child257/test-clone-stream.t-stream-bundle2-v2.sh" 
# Ret was: 0 (test-graft-rename.t) 
ok
test-clone-stream.t#stream-bundle2-v3
test-clone-stream.t#stream-bundle2-v3 ... # Test test-clone-stream.t#stream-bundle2-v3 
# Timout reached for process 1104882 
# Running sh "/tmp/hgtests.qiewis6n/child258/test-clone-stream.t-stream-bundle2-v3.sh" 
# Timout reached for process 1104983 

--- /<<PKGBUILDDIR>>/tests/test-clone-stream.t
+++ /<<PKGBUILDDIR>>/tests/test-clone-stream.t#stream-bundle2-v2.err
@@ -87,6 +87,8 @@
   adding undo.i
   adding undo.n
   adding undo.py
+  Bus error
+  [135]
 
   $ hg --config server.uncompressed=false serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
@@ -100,7 +102,7 @@
 
   $ hg clone server local-clone
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check that the clone went well
 
@@ -169,8 +171,8 @@
   adding changesets
   adding manifests
   adding file changes
-  added 3 changesets with 1088 changes to 1088 files
-  new changesets 96ee1d7354c4:5223b5e3265f
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
 
   $ killdaemons.py
   $ cd server
@@ -202,10 +204,10 @@
   streaming all changes
   1094 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
-  1094 files to transfer, 98.9 KB of data (zstd no-rust !)
-  transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
+  1031 files to transfer, 93.6 KB of data
   1096 files to transfer, 99.0 KB of data (zstd rust !)
   transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
+  transferred 93.6 KB in 0.2 seconds (444 KB/sec)
 #endif
 
 #if stream-bundle2-v3
@@ -246,7 +248,7 @@
   body: size=* (glob)
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: ?? 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |?.STREAM2.......| (glob)
-  0020: 06 09 04 0c ?? 62 79 74 65 63 6f 75 6e 74 31 30 |....?bytecount10| (glob)
+  0020: 05 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 39 35 |....@bytecount95|
 
 --uncompressed is an alias to --stream
 ---------------------------------------
@@ -279,14 +281,13 @@
 clone falls back to a bundle clone.
 
   $ hg -R server phase --force --secret -r tip
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg clone --stream -U http://localhost:$HGPORT secret-denied
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1031 files to transfer, 93.6 KB of data
+  transferred 93.6 KB in 0.2 seconds (502 KB/sec)
 
   $ killdaemons.py
 
@@ -322,12 +323,9 @@
   $ cd ..
 
   $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1031 files to transfer, 93.6 KB of data
+  transferred 93.6 KB in 0.2 seconds (433 KB/sec)
 
   $ killdaemons.py
 
@@ -342,12 +340,11 @@
   $ cd ..
 
   $ hg clone --stream http://localhost:$HGPORT secret-full-disabled
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  remote: abort: server has pull-based clones disabled
-  abort: pull failed on remote
-  (remove --pull if specified or upgrade Mercurial)
-  [100]
+  streaming all changes
+  1031 files to transfer, 93.6 KB of data
+  transferred 93.6 KB in 0.2 seconds (565 KB/sec)
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Local stream clone with secrets involved
 ----------------------------------------
@@ -356,17 +353,13 @@
 there is no security so it isn't important to prevent a clone here.)
 
   $ hg clone -U --stream server local-secret
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
 
 (revert introduction of secret changeset)
 
   $ hg -R server phase --draft 'secret()'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Stream clone while repo is changing:
 ------------------------------------
@@ -420,23 +413,26 @@
 add a bookmark
 
   $ hg -R server bookmark -r tip some-bookmark
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 clone it
 
   $ hg clone --stream http://localhost:$HGPORT with-bookmarks
   streaming all changes
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
-  1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1096 entries to transfer (stream-bundle2-v3 !)
-  transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
+  1032 files to transfer, 93.7 KB of data
+  transferred * KB in * seconds (* */sec) (glob)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R with-bookmarks -q
   $ hg -R with-bookmarks bookmarks
-     some-bookmark             2:5223b5e3265f
+  no bookmarks set
 
 Stream repository with phases
 -----------------------------
@@ -449,24 +445,22 @@
   $ hg -R server phase -r 'all()'
   0: draft
   1: draft
-  2: draft
 
   $ hg clone --stream http://localhost:$HGPORT phase-publish
   streaming all changes
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
-  1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1096 entries to transfer (stream-bundle2-v3 !)
-  transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
+  1032 files to transfer, 93.7 KB of data
+  transferred * KB in * seconds (* */sec) (glob)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R phase-publish -q
   $ hg -R phase-publish phase -r 'all()'
   0: public
   1: public
-  2: public
 
 Clone as non publishing
 
@@ -481,14 +475,14 @@
   $ hg clone --stream http://localhost:$HGPORT phase-no-publish
   streaming all changes
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
-  1098 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1100 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1097 entries to transfer (stream-bundle2-v3 !)
-  transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
+  1033 files to transfer, 93.7 KB of data
+  transferred * KB in * seconds (* */sec) (glob)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Note: With v1 of the stream protocol, changeset are always cloned as public. It
 make stream v1 unsuitable for non-publishing repository.
@@ -499,7 +493,6 @@
   2: public (stream-legacy !)
   0: draft (no-stream-legacy !)
   1: draft (no-stream-legacy !)
-  2: draft (no-stream-legacy !)
   $ hg verify -R phase-no-publish -q
 
   $ killdaemons.py
@@ -527,12 +520,19 @@
   $ cd server
   $ echo foo > foo
   $ hg -q commit -m 'about to be pruned'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents
-  1 new obsolescence markers
-  obsoleted 1 changesets
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up null -q
+  file 'foo' was deleted in other [destination] but was modified in local [working copy].
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
+  [1]
   $ hg log -T '{rev}: {phase}\n'
-  2: draft
   1: draft
   0: draft
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
@@ -541,23 +541,20 @@
 
   $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
   streaming all changes
-  1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1101 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1098 entries to transfer (no-stream-bundle2-v2 !)
+  1033 files to transfer, 93.7 KB of data
   transferred * KB in * seconds (* */sec) (glob)
   $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
-  2: draft
   1: draft
   0: draft
   $ hg debugobsolete -R with-obsolescence
-  8c206a663911c1f97f2f9d7382e417ae55872cfa 0 {5223b5e3265f0df40bb743da62249413d74ac70f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ hg verify -R with-obsolescence -q
 
   $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution
   streaming all changes
-  remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
-  abort: pull failed on remote
-  [100]
+  1033 files to transfer, 93.7 KB of data
+  transferred 93.7 KB in 0.1 seconds (653 KB/sec)
 
   $ killdaemons.py
 

ERROR: test-clone-stream.t#stream-bundle2-v2 output changed
!# Ret was: 0 (test-clone-stream.t#stream-bundle2-v2) 
test-clone-stream.t#stream-legacy
test-clone-stream.t#stream-legacy ... # Test test-clone-stream.t#stream-legacy 
# Running sh "/tmp/hgtests.qiewis6n/child259/test-clone-stream.t-stream-legacy.sh" 
# Ret was: 0 (test-backout.t) 
ok
test-alias.t
test-alias.t ... # Test test-alias.t 
# Timout reached for process 1104710 
# Running sh "/tmp/hgtests.qiewis6n/child260/test-alias.t.sh" 
# Timout reached for process 1105389 

--- /<<PKGBUILDDIR>>/tests/test-clone-stream.t
+++ /<<PKGBUILDDIR>>/tests/test-clone-stream.t#stream-bundle2-v3.err
@@ -87,6 +87,8 @@
   adding undo.i
   adding undo.n
   adding undo.py
+  Bus error
+  [135]
 
   $ hg --config server.uncompressed=false serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
@@ -100,7 +102,7 @@
 
   $ hg clone server local-clone
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check that the clone went well
 
@@ -169,8 +171,8 @@
   adding changesets
   adding manifests
   adding file changes
-  added 3 changesets with 1088 changes to 1088 files
-  new changesets 96ee1d7354c4:5223b5e3265f
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
 
   $ killdaemons.py
   $ cd server
@@ -211,10 +213,10 @@
 #if stream-bundle2-v3
   $ hg clone --stream -U http://localhost:$HGPORT clone1
   streaming all changes
-  1093 entries to transfer
+  1030 entries to transfer
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
-  transferred 98.9 KB in * seconds (* */sec) (glob) (zstd no-rust !)
   transferred 99.0 KB in * seconds (* */sec) (glob) (zstd rust !)
+  transferred 93.6 KB in 0.2 seconds (386 KB/sec)
 #endif
 
 #if no-stream-legacy
@@ -246,7 +248,7 @@
   body: size=* (glob)
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: ?? 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |?.STREAM2.......| (glob)
-  0020: 06 09 04 0c ?? 62 79 74 65 63 6f 75 6e 74 31 30 |....?bytecount10| (glob)
+  0020: 05 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 39 35 |....@bytecount95|
 
 --uncompressed is an alias to --stream
 ---------------------------------------
@@ -279,14 +281,13 @@
 clone falls back to a bundle clone.
 
   $ hg -R server phase --force --secret -r tip
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg clone --stream -U http://localhost:$HGPORT secret-denied
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1030 entries to transfer
+  transferred 93.6 KB in 0.3 seconds (334 KB/sec)
 
   $ killdaemons.py
 
@@ -322,12 +323,9 @@
   $ cd ..
 
   $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1030 entries to transfer
+  transferred 93.6 KB in 0.3 seconds (360 KB/sec)
 
   $ killdaemons.py
 
@@ -342,12 +340,11 @@
   $ cd ..
 
   $ hg clone --stream http://localhost:$HGPORT secret-full-disabled
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  remote: abort: server has pull-based clones disabled
-  abort: pull failed on remote
-  (remove --pull if specified or upgrade Mercurial)
-  [100]
+  streaming all changes
+  1030 entries to transfer
+  transferred 93.6 KB in 0.3 seconds (331 KB/sec)
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Local stream clone with secrets involved
 ----------------------------------------
@@ -356,17 +353,13 @@
 there is no security so it isn't important to prevent a clone here.)
 
   $ hg clone -U --stream server local-secret
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
 
 (revert introduction of secret changeset)
 
   $ hg -R server phase --draft 'secret()'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Stream clone while repo is changing:
 ------------------------------------
@@ -420,6 +413,9 @@
 add a bookmark
 
   $ hg -R server bookmark -r tip some-bookmark
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 clone it
 
@@ -428,15 +424,15 @@
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
-  1096 entries to transfer (stream-bundle2-v3 !)
+  1031 entries to transfer
   transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R with-bookmarks -q
   $ hg -R with-bookmarks bookmarks
-     some-bookmark             2:5223b5e3265f
+  no bookmarks set
 
 Stream repository with phases
 -----------------------------
@@ -449,24 +445,22 @@
   $ hg -R server phase -r 'all()'
   0: draft
   1: draft
-  2: draft
 
   $ hg clone --stream http://localhost:$HGPORT phase-publish
   streaming all changes
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
-  1096 entries to transfer (stream-bundle2-v3 !)
+  1031 entries to transfer
   transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R phase-publish -q
   $ hg -R phase-publish phase -r 'all()'
   0: public
   1: public
-  2: public
 
 Clone as non publishing
 
@@ -483,12 +477,12 @@
   1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1098 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1100 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
-  1097 entries to transfer (stream-bundle2-v3 !)
+  1032 entries to transfer
   transferred * KB in * seconds (* */sec) (glob)
   searching for changes (stream-legacy !)
   no changes found (stream-legacy !)
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Note: With v1 of the stream protocol, changeset are always cloned as public. It
 make stream v1 unsuitable for non-publishing repository.
@@ -499,7 +493,6 @@
   2: public (stream-legacy !)
   0: draft (no-stream-legacy !)
   1: draft (no-stream-legacy !)
-  2: draft (no-stream-legacy !)
   $ hg verify -R phase-no-publish -q
 
   $ killdaemons.py
@@ -527,12 +520,19 @@
   $ cd server
   $ echo foo > foo
   $ hg -q commit -m 'about to be pruned'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents
-  1 new obsolescence markers
-  obsoleted 1 changesets
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up null -q
+  file 'foo' was deleted in other [destination] but was modified in local [working copy].
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
+  [1]
   $ hg log -T '{rev}: {phase}\n'
-  2: draft
   1: draft
   0: draft
   $ hg serve -p $HGPORT -d --pid-file=hg.pid
@@ -543,21 +543,18 @@
   streaming all changes
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1101 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
-  1098 entries to transfer (no-stream-bundle2-v2 !)
+  1032 entries to transfer
   transferred * KB in * seconds (* */sec) (glob)
   $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
-  2: draft
   1: draft
   0: draft
   $ hg debugobsolete -R with-obsolescence
-  8c206a663911c1f97f2f9d7382e417ae55872cfa 0 {5223b5e3265f0df40bb743da62249413d74ac70f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ hg verify -R with-obsolescence -q
 
   $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution
   streaming all changes
-  remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
-  abort: pull failed on remote
-  [100]
+  1032 entries to transfer
+  transferred 93.7 KB in 0.3 seconds (330 KB/sec)
 
   $ killdaemons.py
 

ERROR: test-clone-stream.t#stream-bundle2-v3 output changed
!# Ret was: 0 (test-clone-stream.t#stream-bundle2-v3) 
test-blackbox.t
test-blackbox.t ... # Test test-blackbox.t 
# Running sh "/tmp/hgtests.qiewis6n/child261/test-blackbox.t.sh" 
# Ret was: 0 (test-update-branches.t) 
ok
test-clonebundles-autogen.t
test-clonebundles-autogen.t ... # Test test-clonebundles-autogen.t 
# Timout reached for process 1104371 
# Timout reached for process 1105672 
# Running sh "/tmp/hgtests.qiewis6n/child262/test-clonebundles-autogen.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-clone-stream.t
+++ /<<PKGBUILDDIR>>/tests/test-clone-stream.t#stream-legacy.err
@@ -87,6 +87,8 @@
   adding undo.i
   adding undo.n
   adding undo.py
+  Bus error
+  [135]
 
   $ hg --config server.uncompressed=false serve -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid > $DAEMON_PIDS
@@ -100,7 +102,7 @@
 
   $ hg clone server local-clone
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Check that the clone went well
 
@@ -169,8 +171,8 @@
   adding changesets
   adding manifests
   adding file changes
-  added 3 changesets with 1088 changes to 1088 files
-  new changesets 96ee1d7354c4:5223b5e3265f
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
 
   $ killdaemons.py
   $ cd server
@@ -192,8 +194,8 @@
   streaming all changes
   1091 files to transfer, 102 KB of data (no-zstd !)
   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
-  1091 files to transfer, 98.8 KB of data (zstd !)
-  transferred 98.8 KB in * seconds (* */sec) (glob) (zstd !)
+  1028 files to transfer, 93.5 KB of data
+  transferred 93.5 KB in 0.2 seconds (456 KB/sec)
   searching for changes
   no changes found
 #endif
@@ -246,7 +248,7 @@
   body: size=* (glob)
   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
   0010: ?? 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |?.STREAM2.......| (glob)
-  0020: 06 09 04 0c ?? 62 79 74 65 63 6f 75 6e 74 31 30 |....?bytecount10| (glob)
+  0020: 05 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 39 35 |....@bytecount95|
 
 --uncompressed is an alias to --stream
 ---------------------------------------
@@ -279,14 +281,15 @@
 clone falls back to a bundle clone.
 
   $ hg -R server phase --force --secret -r tip
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg clone --stream -U http://localhost:$HGPORT secret-denied
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1028 files to transfer, 93.5 KB of data
+  transferred 93.5 KB in 0.2 seconds (448 KB/sec)
+  searching for changes
+  no changes found
 
   $ killdaemons.py
 
@@ -322,12 +325,11 @@
   $ cd ..
 
   $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
+  streaming all changes
+  1028 files to transfer, 93.5 KB of data
+  transferred 93.5 KB in 0.2 seconds (492 KB/sec)
+  searching for changes
+  no changes found
 
   $ killdaemons.py
 
@@ -342,12 +344,13 @@
   $ cd ..
 
   $ hg clone --stream http://localhost:$HGPORT secret-full-disabled
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  remote: abort: server has pull-based clones disabled
-  abort: pull failed on remote
-  (remove --pull if specified or upgrade Mercurial)
-  [100]
+  streaming all changes
+  1028 files to transfer, 93.5 KB of data
+  transferred 93.5 KB in 0.2 seconds (452 KB/sec)
+  searching for changes
+  no changes found
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Local stream clone with secrets involved
 ----------------------------------------
@@ -356,17 +359,13 @@
 there is no security so it isn't important to prevent a clone here.)
 
   $ hg clone -U --stream server local-secret
-  warning: stream clone requested but server has them disabled
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1025 changes to 1025 files
-  new changesets 96ee1d7354c4:c17445101a72
 
 (revert introduction of secret changeset)
 
   $ hg -R server phase --draft 'secret()'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Stream clone while repo is changing:
 ------------------------------------
@@ -420,23 +419,26 @@
 add a bookmark
 
   $ hg -R server bookmark -r tip some-bookmark
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 clone it
 
   $ hg clone --stream http://localhost:$HGPORT with-bookmarks
   streaming all changes
-  1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1096 entries to transfer (stream-bundle2-v3 !)
+  1028 files to transfer, 93.5 KB of data
   transferred * KB in * seconds (* */sec) (glob)
-  searching for changes (stream-legacy !)
-  no changes found (stream-legacy !)
+  searching for changes
+  no changes found
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R with-bookmarks -q
   $ hg -R with-bookmarks bookmarks
-     some-bookmark             2:5223b5e3265f
+  no bookmarks set
 
 Stream repository with phases
 -----------------------------
@@ -449,24 +451,22 @@
   $ hg -R server phase -r 'all()'
   0: draft
   1: draft
-  2: draft
 
   $ hg clone --stream http://localhost:$HGPORT phase-publish
   streaming all changes
-  1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1097 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1099 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1096 entries to transfer (stream-bundle2-v3 !)
+  1028 files to transfer, 93.5 KB of data
   transferred * KB in * seconds (* */sec) (glob)
-  searching for changes (stream-legacy !)
-  no changes found (stream-legacy !)
+  searching for changes
+  no changes found
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R phase-publish -q
   $ hg -R phase-publish phase -r 'all()'
   0: public
   1: public
-  2: public
 
 Clone as non publishing
 
@@ -480,15 +480,15 @@
 
   $ hg clone --stream http://localhost:$HGPORT phase-no-publish
   streaming all changes
-  1091 files to transfer, * KB of data (glob) (stream-legacy !)
   1098 files to transfer, * KB of data (glob) (stream-bundle2-v2 no-rust !)
   1100 files to transfer, * KB of data (glob) (stream-bundle2-v2 rust !)
   1097 entries to transfer (stream-bundle2-v3 !)
+  1028 files to transfer, 93.5 KB of data
   transferred * KB in * seconds (* */sec) (glob)
-  searching for changes (stream-legacy !)
-  no changes found (stream-legacy !)
+  searching for changes
+  no changes found
   updating to branch default
-  1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Note: With v1 of the stream protocol, changeset are always cloned as public. It
 make stream v1 unsuitable for non-publishing repository.
@@ -496,7 +496,6 @@
   $ hg -R phase-no-publish phase -r 'all()'
   0: public (stream-legacy !)
   1: public (stream-legacy !)
-  2: public (stream-legacy !)
   0: draft (no-stream-legacy !)
   1: draft (no-stream-legacy !)
   2: draft (no-stream-legacy !)

ERROR: test-clone-stream.t#stream-legacy output changed
!# Ret was: 0 (test-clone-stream.t#stream-legacy) 
test-amend.t#obsstore-off
test-amend.t#obsstore-off ... # Test test-amend.t#obsstore-off 
# Running sh "/tmp/hgtests.qiewis6n/child263/test-amend.t-obsstore-off.sh" 
# Timout reached for process 1105708 
# Ret was: 0 (test-alias.t) 
ok
test-amend.t#obsstore-on
test-amend.t#obsstore-on ... # Test test-amend.t#obsstore-on 
# Running sh "/tmp/hgtests.qiewis6n/child264/test-amend.t-obsstore-on.sh" 
# Timout reached for process 1106184 
# Ret was: 0 (test-blackbox.t) 
ok
test-mq-header-date.t
test-mq-header-date.t ... # Test test-mq-header-date.t 
# Running sh "/tmp/hgtests.qiewis6n/child265/test-mq-header-date.t.sh" 
# Timout reached for process 1106342 
# Ret was: 0 (test-clonebundles-autogen.t) 
ok
test-progress.t
test-progress.t ... # Test test-progress.t 
# Running sh "/tmp/hgtests.qiewis6n/child266/test-progress.t.sh" 
# Timout reached for process 1106880 
# Ret was: 0 (test-progress.t) 
ok
test-convert-svn-startrev.t
test-convert-svn-startrev.t ... # Test test-convert-svn-startrev.t 
# Running sh "/tmp/hgtests.qiewis6n/child267/test-convert-svn-startrev.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-svn-startrev.t) 
test-narrow.t#flat#lfs-off
test-narrow.t#flat#lfs-off ... # Test test-narrow.t#flat#lfs-off 
# Timout reached for process 1107012 
# Running sh "/tmp/hgtests.qiewis6n/child268/test-narrow.t-flat-lfs-off.sh" 

--- /<<PKGBUILDDIR>>/tests/test-amend.t
+++ /<<PKGBUILDDIR>>/tests/test-amend.t#obsstore-off.err
@@ -358,10 +358,15 @@
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
   $ hg addremove -q --similarity 0
   $ hg commit -m0
+  Bus error
+  [135]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
   $ hg addremove -q --similarity 0
   $ hg commit -m1
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
   $ hg addremove -q --similarity 0
@@ -371,54 +376,32 @@
 amend r1 to include wc changes
 
   $ hg amend
-  saved backup bundle to * (glob) (obsstore-off !)
+  abort: cannot amend the null revision
+  (no changeset checked out)
+  [10]
 
 clean/modified/removed/added states of the amended revision
 
   $ hg status --all --change . 'glob:content1_*_content1-tracked'
-  C content1_content1_content1-tracked
-  C content1_content2_content1-tracked
-  C content1_missing_content1-tracked
   $ hg status --all --change . 'glob:content1_*_content[23]-tracked'
-  M content1_content1_content3-tracked
-  M content1_content2_content2-tracked
-  M content1_content2_content3-tracked
-  M content1_missing_content3-tracked
   $ hg status --all --change . 'glob:content1_*_missing-tracked'
-  M content1_content2_missing-tracked
-  R content1_missing_missing-tracked
-  C content1_content1_missing-tracked
   $ hg status --all --change . 'glob:content1_*_*-untracked'
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-untracked
   $ hg status --all --change . 'glob:missing_content2_*'
+  $ hg status --all --change . 'glob:missing_missing_*'
+
+working directory should be all clean (with some missing/untracked files)
+
+  $ hg status --all 'glob:*_content?-tracked'
+  A content1_content1_content1-tracked
+  A content1_content1_content3-tracked
+  A content1_content2_content1-tracked
+  A content1_content2_content2-tracked
+  A content1_content2_content3-tracked
+  A content1_missing_content1-tracked
+  A content1_missing_content3-tracked
   A missing_content2_content2-tracked
   A missing_content2_content3-tracked
-  A missing_content2_missing-tracked
-  $ hg status --all --change . 'glob:missing_missing_*'
   A missing_missing_content3-tracked
-
-working directory should be all clean (with some missing/untracked files)
-
-  $ hg status --all 'glob:*_content?-tracked'
-  C content1_content1_content1-tracked
-  C content1_content1_content3-tracked
-  C content1_content2_content1-tracked
-  C content1_content2_content2-tracked
-  C content1_content2_content3-tracked
-  C content1_missing_content1-tracked
-  C content1_missing_content3-tracked
-  C missing_content2_content2-tracked
-  C missing_content2_content3-tracked
-  C missing_missing_content3-tracked
   $ hg status --all 'glob:*_missing-tracked'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked

ERROR: test-amend.t#obsstore-off output changed
!# Ret was: 0 (test-amend.t#obsstore-off) 
test-narrow.t#flat#lfs-on
test-narrow.t#flat#lfs-on ... # Test test-narrow.t#flat#lfs-on 
# Timout reached for process 1106366 
# Running sh "/tmp/hgtests.qiewis6n/child269/test-narrow.t-flat-lfs-on.sh" 
# Timout reached for process 1106591 

--- /<<PKGBUILDDIR>>/tests/test-amend.t
+++ /<<PKGBUILDDIR>>/tests/test-amend.t#obsstore-on.err
@@ -358,10 +358,15 @@
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
   $ hg addremove -q --similarity 0
   $ hg commit -m0
+  Bus error
+  [135]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
   $ hg addremove -q --similarity 0
   $ hg commit -m1
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
   $ hg addremove -q --similarity 0
@@ -372,53 +377,32 @@
 
   $ hg amend
   saved backup bundle to * (glob) (obsstore-off !)
+  abort: cannot amend the null revision
+  (no changeset checked out)
+  [10]
 
 clean/modified/removed/added states of the amended revision
 
   $ hg status --all --change . 'glob:content1_*_content1-tracked'
-  C content1_content1_content1-tracked
-  C content1_content2_content1-tracked
-  C content1_missing_content1-tracked
   $ hg status --all --change . 'glob:content1_*_content[23]-tracked'
-  M content1_content1_content3-tracked
-  M content1_content2_content2-tracked
-  M content1_content2_content3-tracked
-  M content1_missing_content3-tracked
   $ hg status --all --change . 'glob:content1_*_missing-tracked'
-  M content1_content2_missing-tracked
-  R content1_missing_missing-tracked
-  C content1_content1_missing-tracked
   $ hg status --all --change . 'glob:content1_*_*-untracked'
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-untracked
   $ hg status --all --change . 'glob:missing_content2_*'
+  $ hg status --all --change . 'glob:missing_missing_*'
+
+working directory should be all clean (with some missing/untracked files)
+
+  $ hg status --all 'glob:*_content?-tracked'
+  A content1_content1_content1-tracked
+  A content1_content1_content3-tracked
+  A content1_content2_content1-tracked
+  A content1_content2_content2-tracked
+  A content1_content2_content3-tracked
+  A content1_missing_content1-tracked
+  A content1_missing_content3-tracked
   A missing_content2_content2-tracked
   A missing_content2_content3-tracked
-  A missing_content2_missing-tracked
-  $ hg status --all --change . 'glob:missing_missing_*'
   A missing_missing_content3-tracked
-
-working directory should be all clean (with some missing/untracked files)
-
-  $ hg status --all 'glob:*_content?-tracked'
-  C content1_content1_content1-tracked
-  C content1_content1_content3-tracked
-  C content1_content2_content1-tracked
-  C content1_content2_content2-tracked
-  C content1_content2_content3-tracked
-  C content1_missing_content1-tracked
-  C content1_missing_content3-tracked
-  C missing_content2_content2-tracked
-  C missing_content2_content3-tracked
-  C missing_missing_content3-tracked
   $ hg status --all 'glob:*_missing-tracked'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked

ERROR: test-amend.t#obsstore-on output changed
!# Ret was: 0 (test-amend.t#obsstore-on) 
test-narrow.t#tree#lfs-off
test-narrow.t#tree#lfs-off ... # Test test-narrow.t#tree#lfs-off 
# Running sh "/tmp/hgtests.qiewis6n/child270/test-narrow.t-tree-lfs-off.sh" 
# Ret was: 0 (test-mq-header-date.t) 
ok
test-narrow.t#tree#lfs-on
test-narrow.t#tree#lfs-on ... # Test test-narrow.t#tree#lfs-on 
# Timout reached for process 1106675 
# Running sh "/tmp/hgtests.qiewis6n/child271/test-narrow.t-tree-lfs-on.sh" 
# Timout reached for process 1107021 
# Ret was: 0 (test-narrow.t#flat#lfs-off) 
ok
test-ssh-bundle1.t
test-ssh-bundle1.t ... # Test test-ssh-bundle1.t 
# Running sh "/tmp/hgtests.qiewis6n/child272/test-ssh-bundle1.t.sh" 
# Timout reached for process 1107204 
# Ret was: 0 (test-narrow.t#flat#lfs-on) 
ok
test-copies.t#changeset
test-copies.t#changeset ... # Test test-copies.t#changeset 
# Running sh "/tmp/hgtests.qiewis6n/child273/test-copies.t-changeset.sh" 
# Timout reached for process 1107674 
# Ret was: 0 (test-narrow.t#tree#lfs-off) 
ok
test-copies.t#compatibility
test-copies.t#compatibility ... # Test test-copies.t#compatibility 
# Running sh "/tmp/hgtests.qiewis6n/child274/test-copies.t-compatibility.sh" 
# Timout reached for process 1108247 
# Ret was: 0 (test-ssh-bundle1.t) 
ok
test-copies.t#filelog
test-copies.t#filelog ... # Test test-copies.t#filelog 
# Running sh "/tmp/hgtests.qiewis6n/child275/test-copies.t-filelog.sh" 
# Timout reached for process 1107988 
# Ret was: 0 (test-narrow.t#tree#lfs-on) 
ok
test-copies.t#sidedata
test-copies.t#sidedata ... # Test test-copies.t#sidedata 
# Running sh "/tmp/hgtests.qiewis6n/child276/test-copies.t-sidedata.sh" 
# Ret was: 0 (test-copies.t#changeset) 
ok
test-push-http.t#bundle1
test-push-http.t#bundle1 ... # Test test-push-http.t#bundle1 
# Timout reached for process 1108629 
# Running sh "/tmp/hgtests.qiewis6n/child277/test-push-http.t-bundle1.sh" 
# Ret was: 0 (test-copies.t#compatibility) 
ok
test-push-http.t#bundle2
test-push-http.t#bundle2 ... # Test test-push-http.t#bundle2 
# Timout reached for process 1108997 
# Running sh "/tmp/hgtests.qiewis6n/child278/test-push-http.t-bundle2.sh" 
# Timout reached for process 1110134 
# Ret was: 0 (test-push-http.t#bundle1) 
ok
test-globalopts.t
test-globalopts.t ... # Test test-globalopts.t 
# Timout reached for process 1109100 
# Ret was: 0 (test-copies.t#filelog) 
ok
test-contrib-relnotes.t
test-contrib-relnotes.t ... # Test test-contrib-relnotes.t 
# Running sh "/tmp/hgtests.qiewis6n/child280/test-contrib-relnotes.t.sh" 
skipped missing feature: a Python 3.x interpreter is available
# Ret was: 80 (test-contrib-relnotes.t) 
test-histedit-obsolete.t#abortcommand
test-histedit-obsolete.t#abortcommand ... # Test test-histedit-obsolete.t#abortcommand 
# Timout reached for process 1110542 
# Running sh "/tmp/hgtests.qiewis6n/child281/test-histedit-obsolete.t-abortcommand.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child279/test-globalopts.t.sh" 
# Ret was: 0 (test-globalopts.t) 
ok
test-histedit-obsolete.t#abortflag
test-histedit-obsolete.t#abortflag ... # Test test-histedit-obsolete.t#abortflag 
# Timout reached for process 1110569 
# Running sh "/tmp/hgtests.qiewis6n/child282/test-histedit-obsolete.t-abortflag.sh" 
# Timout reached for process 1109375 
# Ret was: 0 (test-copies.t#sidedata) 
ok
test-audit-subrepo.t
test-audit-subrepo.t ... # Test test-audit-subrepo.t 
# Ret was: 0 (test-push-http.t#bundle2) 
ok
test-chg.t
test-chg.t ... # Test test-chg.t 
# Timout reached for process 1110446 
# Running sh "/tmp/hgtests.qiewis6n/child284/test-chg.t.sh" 
skipped missing feature: running with chg
# Ret was: 80 (test-chg.t) 
test-histedit-arguments.t#abortcommand
test-histedit-arguments.t#abortcommand ... # Test test-histedit-arguments.t#abortcommand 
# Running sh "/tmp/hgtests.qiewis6n/child285/test-histedit-arguments.t-abortcommand.sh" 
# Timout reached for process 1110918 
# Running sh "/tmp/hgtests.qiewis6n/child283/test-audit-subrepo.t.sh" 
# Ret was: 0 (test-histedit-obsolete.t#abortcommand) 
ok
test-histedit-arguments.t#abortflag
test-histedit-arguments.t#abortflag ... # Test test-histedit-arguments.t#abortflag 
# Timout reached for process 1110558 
# Running sh "/tmp/hgtests.qiewis6n/child286/test-histedit-arguments.t-abortflag.sh" 
# Timout reached for process 1110927 
# Ret was: 0 (test-audit-subrepo.t) 
ok
test-pull-pull-corruption.t
test-pull-pull-corruption.t ... # Test test-pull-pull-corruption.t 
# Running sh "/tmp/hgtests.qiewis6n/child287/test-pull-pull-corruption.t.sh" 
# Timout reached for process 1110922 
# Ret was: 0 (test-histedit-obsolete.t#abortflag) 
ok
test-http-bundle1.t
test-http-bundle1.t ... # Test test-http-bundle1.t 
# Timout reached for process 1110887 
# Ret was: 0 (test-histedit-arguments.t#abortcommand) 
ok
test-rebase-collapse.t
test-rebase-collapse.t ... # Test test-rebase-collapse.t 
# Running sh "/tmp/hgtests.qiewis6n/child289/test-rebase-collapse.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child288/test-http-bundle1.t.sh" 
# Ret was: 0 (test-pull-pull-corruption.t) 
ok
test-extdiff.t
test-extdiff.t ... # Test test-extdiff.t 
# Timout reached for process 1111423 
# Running sh "/tmp/hgtests.qiewis6n/child290/test-extdiff.t.sh" 
# Timout reached for process 1111268 
# Ret was: 0 (test-histedit-arguments.t#abortflag) 
ok
test-wireproto.t
test-wireproto.t ... # Test test-wireproto.t 
# Running sh "/tmp/hgtests.qiewis6n/child291/test-wireproto.t.sh" 
# Timout reached for process 1111535 
# Killing daemon process 1111840 
# Killing daemon process 1111869 
# Ret was: 0 (test-http-bundle1.t) 
ok
test-hgweb-descend-empties.t
test-hgweb-descend-empties.t ... # Test test-hgweb-descend-empties.t 
# Running sh "/tmp/hgtests.qiewis6n/child292/test-hgweb-descend-empties.t.sh" 
# Killing daemon process 1111996 
# Timout reached for process 1111970 
# Daemon process 1111996 is stuck - really killing it 
# Ret was: 0 (test-hgweb-descend-empties.t) 
ok
test-obshistory.t
test-obshistory.t ... # Test test-obshistory.t 
# Running sh "/tmp/hgtests.qiewis6n/child293/test-obshistory.t.sh" 
# Ret was: 0 (test-wireproto.t) 
ok
test-uncommit.t
test-uncommit.t ... # Test test-uncommit.t 
# Running sh "/tmp/hgtests.qiewis6n/child294/test-uncommit.t.sh" 
# Timout reached for process 1111874 
# Timout reached for process 1111672 
# Ret was: 0 (test-extdiff.t) 
ok
test-rename.t
test-rename.t ... # Test test-rename.t 
# Running sh "/tmp/hgtests.qiewis6n/child295/test-rename.t.sh" 
# Ret was: 0 (test-rebase-collapse.t) 
ok
test-mq-subrepo.t
test-mq-subrepo.t ... # Test test-mq-subrepo.t 
# Running sh "/tmp/hgtests.qiewis6n/child296/test-mq-subrepo.t.sh" 
# Timout reached for process 1111527 
# Ret was: 0 (test-obshistory.t) 
ok
test-rebase-obsolete3.t
test-rebase-obsolete3.t ... # Test test-rebase-obsolete3.t 
# Running sh "/tmp/hgtests.qiewis6n/child297/test-rebase-obsolete3.t.sh" 
# Timout reached for process 1112035 
# Timout reached for process 1112224 
# Ret was: 0 (test-rename.t) 
ok
test-fncache.t
test-fncache.t ... # Test test-fncache.t 
# Running sh "/tmp/hgtests.qiewis6n/child298/test-fncache.t.sh" 
# Ret was: 0 (test-uncommit.t) 
ok
test-fastannotate-hg.t
test-fastannotate-hg.t ... # Test test-fastannotate-hg.t 
# Timout reached for process 1112171 
# Running sh "/tmp/hgtests.qiewis6n/child299/test-fastannotate-hg.t.sh" 
# Ret was: 0 (test-rebase-obsolete3.t) 
ok
test-histedit-fold.t
test-histedit-fold.t ... # Test test-histedit-fold.t 
# Running sh "/tmp/hgtests.qiewis6n/child300/test-histedit-fold.t.sh" 
# Timout reached for process 1112687 
# Timout reached for process 1112884 
# Ret was: 0 (test-fncache.t) 
ok
test-histedit-commute.t
test-histedit-commute.t ... # Test test-histedit-commute.t 
# Running sh "/tmp/hgtests.qiewis6n/child301/test-histedit-commute.t.sh" 
# Timout reached for process 1112306 
# Ret was: 0 (test-mq-subrepo.t) 
ok
test-remotefilelog-repack-fast.t
test-remotefilelog-repack-fast.t ... # Test test-remotefilelog-repack-fast.t 
# Running sh "/tmp/hgtests.qiewis6n/child302/test-remotefilelog-repack-fast.t.sh" 
# Ret was: 0 (test-histedit-commute.t) 
ok
test-getbundle.t
test-getbundle.t ... # Test test-getbundle.t 
# Timout reached for process 1113188 
# Running sh "/tmp/hgtests.qiewis6n/child303/test-getbundle.t.sh" 
# Killing daemon process 1113685 
# Timout reached for process 1113597 
# Daemon process 1113685 is stuck - really killing it 
# Ret was: 0 (test-getbundle.t) 
ok
test-status-color.t
test-status-color.t ... # Test test-status-color.t 
# Running sh "/tmp/hgtests.qiewis6n/child304/test-status-color.t.sh" 
# Timout reached for process 1113024 
# Ret was: 0 (test-fastannotate-hg.t) 
ok
test-bundle2-multiple-changegroups.t
test-bundle2-multiple-changegroups.t ... # Test test-bundle2-multiple-changegroups.t 
# Running sh "/tmp/hgtests.qiewis6n/child305/test-bundle2-multiple-changegroups.t.sh" 
# Timout reached for process 1113144 
# Ret was: 0 (test-histedit-fold.t) 
ok
test-branches-obsolete.t#v2
test-branches-obsolete.t#v2 ... # Test test-branches-obsolete.t#v2 
# Running sh "/tmp/hgtests.qiewis6n/child306/test-branches-obsolete.t-v2.sh" 
# Ret was: 0 (test-remotefilelog-repack-fast.t) 
ok
test-branches-obsolete.t#v3
test-branches-obsolete.t#v3 ... # Test test-branches-obsolete.t#v3 
# Timout reached for process 1113460 
# Running sh "/tmp/hgtests.qiewis6n/child307/test-branches-obsolete.t-v3.sh" 
# Timout reached for process 1113739 
# Ret was: 0 (test-status-color.t) 
ok
test-convert-hg-sink.t
test-convert-hg-sink.t ... # Test test-convert-hg-sink.t 
# Running sh "/tmp/hgtests.qiewis6n/child308/test-convert-hg-sink.t.sh" 
# Timout reached for process 1113770 
# Ret was: 0 (test-bundle2-multiple-changegroups.t) 
ok
test-stream-bundle-v2.t#stream-v2
test-stream-bundle-v2.t#stream-v2 ... # Test test-stream-bundle-v2.t#stream-v2 
# Running sh "/tmp/hgtests.qiewis6n/child309/test-stream-bundle-v2.t-stream-v2.sh" 
# Ret was: 0 (test-branches-obsolete.t#v2) 
ok
test-stream-bundle-v2.t#stream-v3
test-stream-bundle-v2.t#stream-v3 ... # Test test-stream-bundle-v2.t#stream-v3 
# Timout reached for process 1114063 
# Running sh "/tmp/hgtests.qiewis6n/child310/test-stream-bundle-v2.t-stream-v3.sh" 
# Timout reached for process 1114411 
# Killing daemon process 1114474 
# Daemon process 1114474 is stuck - really killing it 
# Killing daemon process 1114495 
# Daemon process 1114495 is stuck - really killing it 
# Ret was: 0 (test-stream-bundle-v2.t#stream-v2) 
ok
test-logexchange.t
test-logexchange.t ... # Test test-logexchange.t 
# Running sh "/tmp/hgtests.qiewis6n/child311/test-logexchange.t.sh" 
# Timout reached for process 1114482 
# Killing daemon process 1114548 
# Daemon process 1114548 is stuck - really killing it 
# Killing daemon process 1114565 
# Daemon process 1114565 is stuck - really killing it 
# Ret was: 0 (test-stream-bundle-v2.t#stream-v3) 
ok
test-sidedata-exchange.t
test-sidedata-exchange.t ... # Test test-sidedata-exchange.t 
# Running sh "/tmp/hgtests.qiewis6n/child312/test-sidedata-exchange.t.sh" 
# Ret was: 0 (test-branches-obsolete.t#v3) 
ok
test-transaction-rollback-on-revlog-split.t
test-transaction-rollback-on-revlog-split.t ... # Test test-transaction-rollback-on-revlog-split.t 
# Timout reached for process 1114276 
# Running sh "/tmp/hgtests.qiewis6n/child313/test-transaction-rollback-on-revlog-split.t.sh" 
# Timout reached for process 1114299 
# Ret was: 0 (test-convert-hg-sink.t) 
ok
test-absorb.t
test-absorb.t ... # Test test-absorb.t 
# Running sh "/tmp/hgtests.qiewis6n/child314/test-absorb.t.sh" 
# Ret was: 0 (test-logexchange.t) 
ok
test-merge-types.t
test-merge-types.t ... # Test test-merge-types.t 
# Timout reached for process 1114567 
# Running sh "/tmp/hgtests.qiewis6n/child315/test-merge-types.t.sh" 
# Timout reached for process 1114721 
# Ret was: 0 (test-transaction-rollback-on-revlog-split.t) 
ok
test-histedit-edit.t
test-histedit-edit.t ... # Test test-histedit-edit.t 
# Running sh "/tmp/hgtests.qiewis6n/child316/test-histedit-edit.t.sh" 
# Ret was: 0 (test-sidedata-exchange.t) 
ok
test-lfconvert.t
test-lfconvert.t ... # Test test-lfconvert.t 
# Timout reached for process 1114635 
# Running sh "/tmp/hgtests.qiewis6n/child317/test-lfconvert.t.sh" 
# Ret was: 0 (test-merge-types.t) 
ok
test-revlog-delta-find.t
test-revlog-delta-find.t ... # Test test-revlog-delta-find.t 
# Running sh "/tmp/hgtests.qiewis6n/child318/test-revlog-delta-find.t.sh" 
# Timout reached for process 1115100 
# Ret was: 0 (test-histedit-edit.t) 
ok
test-largefiles-wireproto.t
test-largefiles-wireproto.t ... # Test test-largefiles-wireproto.t 
# Timout reached for process 1115105 
# Running sh "/tmp/hgtests.qiewis6n/child319/test-largefiles-wireproto.t.sh" 
# Timout reached for process 1115303 
# Ret was: 0 (test-lfconvert.t) 
ok
test-remotefilelog-bgprefetch.t
test-remotefilelog-bgprefetch.t ... # Test test-remotefilelog-bgprefetch.t 
# Running sh "/tmp/hgtests.qiewis6n/child320/test-remotefilelog-bgprefetch.t.sh" 
# Timout reached for process 1115538 
# Ret was: 0 (test-revlog-delta-find.t) 
ok
test-paths.t
test-paths.t ... # Test test-paths.t 
# Running sh "/tmp/hgtests.qiewis6n/child321/test-paths.t.sh" 
# Ret was: 0 (test-absorb.t) 
ok
test-fetch.t
test-fetch.t ... # Test test-fetch.t 
# Timout reached for process 1114960 
# Running sh "/tmp/hgtests.qiewis6n/child322/test-fetch.t.sh" 
# Timout reached for process 1115819 
# Ret was: 0 (test-paths.t) 
ok
test-rebase-named-branches.t
test-rebase-named-branches.t ... # Test test-rebase-named-branches.t 
# Running sh "/tmp/hgtests.qiewis6n/child323/test-rebase-named-branches.t.sh" 
# Timout reached for process 1115873 
# Ret was: 0 (test-remotefilelog-bgprefetch.t) 
ok
test-rebase-conflicts.t
test-rebase-conflicts.t ... # Test test-rebase-conflicts.t 
# Running sh "/tmp/hgtests.qiewis6n/child324/test-rebase-conflicts.t.sh" 
# Ret was: 0 (test-largefiles-wireproto.t) 
ok
test-eol.t
test-eol.t ... # Test test-eol.t 
# Timout reached for process 1115740 
# Running sh "/tmp/hgtests.qiewis6n/child325/test-eol.t.sh" 
# Killing daemon process 1116061 
# Timout reached for process 1115968 
# Daemon process 1116061 is stuck - really killing it 
# Ret was: 0 (test-fetch.t) 
ok
test-incoming-outgoing.t
test-incoming-outgoing.t ... # Test test-incoming-outgoing.t 
# Running sh "/tmp/hgtests.qiewis6n/child326/test-incoming-outgoing.t.sh" 
# Ret was: 0 (test-rebase-conflicts.t) 
ok
test-manifest.t
test-manifest.t ... # Test test-manifest.t 
# Running sh "/tmp/hgtests.qiewis6n/child327/test-manifest.t.sh" 
# Timout reached for process 1116445 
# Ret was: 0 (test-rebase-named-branches.t) 
ok
test-fix-topology.t#obsstore-off
test-fix-topology.t#obsstore-off ... # Test test-fix-topology.t#obsstore-off 
# Running sh "/tmp/hgtests.qiewis6n/child328/test-fix-topology.t-obsstore-off.sh" 
# Timout reached for process 1116423 
# Killing daemon process 1116731 
# Timout reached for process 1116672 
# Daemon process 1116731 is stuck - really killing it 
# Ret was: 0 (test-incoming-outgoing.t) 
ok
test-fix-topology.t#obsstore-on
test-fix-topology.t#obsstore-on ... # Test test-fix-topology.t#obsstore-on 
# Running sh "/tmp/hgtests.qiewis6n/child329/test-fix-topology.t-obsstore-on.sh" 
# Timout reached for process 1116512 
# Ret was: 0 (test-eol.t) 
ok
test-newbranch.t
test-newbranch.t ... # Test test-newbranch.t 
# Running sh "/tmp/hgtests.qiewis6n/child330/test-newbranch.t.sh" 
# Timout reached for process 1116849 
# Ret was: 0 (test-fix-topology.t#obsstore-off) 
ok
test-hgignore.t#dirstate-v1
test-hgignore.t#dirstate-v1 ... # Test test-hgignore.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child331/test-hgignore.t-dirstate-v1.sh" 
# Ret was: 0 (test-manifest.t) 
ok
test-hgignore.t#dirstate-v2
test-hgignore.t#dirstate-v2 ... # Test test-hgignore.t#dirstate-v2 
# Timout reached for process 1116777 
# Running sh "/tmp/hgtests.qiewis6n/child332/test-hgignore.t-dirstate-v2.sh" 
# Timout reached for process 1117249 
# Ret was: 0 (test-hgignore.t#dirstate-v1) 
ok
test-completion.t
test-completion.t ... # Test test-completion.t 
# Running sh "/tmp/hgtests.qiewis6n/child333/test-completion.t.sh" 
# Ret was: 0 (test-fix-topology.t#obsstore-on) 
ok
test-dirstate.t#dirstate-v1
test-dirstate.t#dirstate-v1 ... # Test test-dirstate.t#dirstate-v1 
# Timout reached for process 1116961 
# Running sh "/tmp/hgtests.qiewis6n/child334/test-dirstate.t-dirstate-v1.sh" 
# Timout reached for process 1117316 
# Ret was: 0 (test-hgignore.t#dirstate-v2) 
ok
test-dirstate.t#dirstate-v2
test-dirstate.t#dirstate-v2 ... # Test test-dirstate.t#dirstate-v2 
# Running sh "/tmp/hgtests.qiewis6n/child335/test-dirstate.t-dirstate-v2.sh" 
# Ret was: 0 (test-completion.t) 
ok
test-rollback.t
test-rollback.t ... # Test test-rollback.t 
# Timout reached for process 1117648 
# Running sh "/tmp/hgtests.qiewis6n/child336/test-rollback.t.sh" 
# Ret was: 0 (test-dirstate.t#dirstate-v1) 
ok
test-config.t
test-config.t ... # Test test-config.t 
# Timout reached for process 1117700 
# Running sh "/tmp/hgtests.qiewis6n/child337/test-config.t.sh" 
# Ret was: 0 (test-newbranch.t) 
ok
test-remote-hidden.t
test-remote-hidden.t ... # Test test-remote-hidden.t 
# Timout reached for process 1117104 
# Running sh "/tmp/hgtests.qiewis6n/child338/test-remote-hidden.t.sh" 
# Timout reached for process 1117742 
# Ret was: 0 (test-dirstate.t#dirstate-v2) 
ok
test-git-export.t
test-git-export.t ... # Test test-git-export.t 
# Running sh "/tmp/hgtests.qiewis6n/child339/test-git-export.t.sh" 
# Ret was: 0 (test-config.t) 
ok
test-install.t
test-install.t ... # Test test-install.t 
# Timout reached for process 1117898 
# Running sh "/tmp/hgtests.qiewis6n/child340/test-install.t.sh" 
# Timout reached for process 1118358 
# Ret was: 0 (test-install.t) 
ok
test-rebase-interruptions.t
test-rebase-interruptions.t ... # Test test-rebase-interruptions.t 
# Running sh "/tmp/hgtests.qiewis6n/child341/test-rebase-interruptions.t.sh" 
# Timout reached for process 1117828 
# Ret was: 0 (test-rollback.t) 
ok
test-fastexport.t
test-fastexport.t ... # Test test-fastexport.t 
# Running sh "/tmp/hgtests.qiewis6n/child342/test-fastexport.t.sh" 
# Timout reached for process 1118022 
# Ret was: 0 (test-remote-hidden.t) 
ok
test-rebase-obsolete4.t
test-rebase-obsolete4.t ... # Test test-rebase-obsolete4.t 
# Running sh "/tmp/hgtests.qiewis6n/child343/test-rebase-obsolete4.t.sh" 
# Ret was: 0 (test-fastexport.t) 
ok
test-diff-color.t
test-diff-color.t ... # Test test-diff-color.t 
# Timout reached for process 1118504 
# Running sh "/tmp/hgtests.qiewis6n/child344/test-diff-color.t.sh" 
# Ret was: 0 (test-diff-color.t) 
ok
test-lfs-largefiles.t
test-lfs-largefiles.t ... # Test test-lfs-largefiles.t 
# Timout reached for process 1118590 
# Running sh "/tmp/hgtests.qiewis6n/child345/test-lfs-largefiles.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-git-export.t
+++ /<<PKGBUILDDIR>>/tests/test-git-export.t.err
@@ -391,85 +391,224 @@
   $ hg revert -r -2 start
   $ hg mv dst2 dst3
   $ hg ci -m 'mv dst2 dst3; revert start'
+  Bus error
+  [135]
 
   $ hg diff --git -r 9:11
-  diff --git a/dst2 b/dst3
-  rename from dst2
-  rename to dst3
+  abort: unknown revision '11'
+  [10]
 
 Reversed:
 
   $ hg diff --git -r 11:9
-  diff --git a/dst3 b/dst2
-  rename from dst3
-  rename to dst2
+  abort: unknown revision '11'
+  [10]
 
 
   $ echo a >> foo
   $ hg add foo
   $ hg ci -m 'add foo'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ echo b >> foo
   $ hg ci -m 'change foo'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg mv foo bar
+  foo has not been committed yet, so no copy data will be stored for bar.
   $ hg ci -m 'mv foo bar'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ echo c >> bar
   $ hg ci -m 'change bar'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 File created before r1 and renamed before r2:
 
   $ hg diff --git -r -3:-1
-  diff --git a/foo b/bar
-  rename from foo
-  rename to bar
-  --- a/foo
-  +++ b/bar
-  @@ -1,2 +1,3 @@
-   a
-   b
-  +c
+  diff --git a/dst b/dst2
+  rename from dst
+  rename to dst2
+  diff --git a/binfile.bin b/renamed.bin
+  rename from binfile.bin
+  rename to renamed.bin
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
 
 Reversed:
 
   $ hg diff --git -r -1:-3
-  diff --git a/bar b/foo
-  rename from bar
-  rename to foo
-  --- a/bar
-  +++ b/foo
-  @@ -1,3 +1,2 @@
-   a
-   b
-  -c
+  diff --git a/renamed.bin b/binfile.bin
+  rename from renamed.bin
+  rename to binfile.bin
+  diff --git a/dst2 b/dst
+  rename from dst2
+  rename to dst
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,2 +1,1 @@
+   start
+  -
 
 File created in r1 and renamed before r2:
 
   $ hg diff --git -r -4:-1
-  diff --git a/foo b/bar
-  rename from foo
-  rename to bar
-  --- a/foo
-  +++ b/bar
-  @@ -1,1 +1,3 @@
-   a
-  +b
-  +c
+  diff --git a/dst b/dst2
+  rename from dst
+  rename to dst2
+  diff --git a/renamed.bin b/renamed.bin
+  new file mode 100644
+  index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
+  GIT binary patch
+  literal 593
+  zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
+  z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
+  zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
+  z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
+  zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
+  ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
+  zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
+  z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
+  zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
+  z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
+  zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
+  fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4
+  
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
 
 Reversed:
 
   $ hg diff --git -r -1:-4
-  diff --git a/bar b/foo
-  rename from bar
-  rename to foo
-  --- a/bar
-  +++ b/foo
-  @@ -1,3 +1,1 @@
-   a
-  -b
-  -c
+  diff --git a/dst2 b/dst
+  rename from dst2
+  rename to dst
+  diff --git a/renamed.bin b/renamed.bin
+  deleted file mode 100644
+  index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..0000000000000000000000000000000000000000
+  GIT binary patch
+  literal 0
+  Hc$@<O00001
+  
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,2 +1,1 @@
+   start
+  -
 
 File created after r1 and renamed before r2:
 
   $ hg diff --git -r -5:-1
+  diff --git a/src b/dst2
+  old mode 100755
+  new mode 100644
+  rename from src
+  rename to dst2
+  --- a/src
+  +++ b/dst2
+  @@ -3,3 +3,4 @@
+   3
+   4
+   5
+  +a
+  diff --git a/renamed.bin b/renamed.bin
+  new file mode 100644
+  index 0000000000000000000000000000000000000000..37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9
+  GIT binary patch
+  literal 593
+  zc$@)I0<QguP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
+  z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
+  zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
+  z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
+  zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
+  ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
+  zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
+  z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
+  zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
+  z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
+  zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
+  fQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf{mKw4
+  
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
+
+Reversed:
+
+  $ hg diff --git -r -1:-5
+  diff --git a/renamed.bin b/renamed.bin
+  deleted file mode 100644
+  index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..0000000000000000000000000000000000000000
+  GIT binary patch
+  literal 0
+  Hc$@<O00001
+  
+  diff --git a/dst2 b/src
+  old mode 100644
+  new mode 100755
+  rename from dst2
+  rename to src
+  --- a/dst2
+  +++ b/src
+  @@ -3,4 +3,3 @@
+   3
+   4
+   5
+  -a
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,2 +1,1 @@
+   start
+  -
+
+
+Comparing with the working dir:
+
+  $ echo >> start
+  $ hg ci -m 'change start again'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+
+  $ echo > created
+  $ hg add created
+  $ hg ci -m 'add created'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+
+  $ hg mv created created2
+  created has not been committed yet, so no copy data will be stored for created2.
+  $ hg ci -m 'mv created created2'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
+
+  $ hg mv created2 created3
+  created2 has not been committed yet, so no copy data will be stored for created3.
+
+There's a copy in the working dir:
+
+  $ hg diff --git
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
@@ -478,107 +617,177 @@
   +a
   +b
   +c
-
-Reversed:
-
-  $ hg diff --git -r -1:-5
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
+
+There's another copy between the original rev and the wd:
+
+  $ hg diff --git -r -2
   diff --git a/bar b/bar
-  deleted file mode 100644
-  --- a/bar
-  +++ /dev/null
-  @@ -1,3 +0,0 @@
-  -a
-  -b
-  -c
-
-
-Comparing with the working dir:
-
-  $ echo >> start
-  $ hg ci -m 'change start again'
-
-  $ echo > created
-  $ hg add created
-  $ hg ci -m 'add created'
-
-  $ hg mv created created2
-  $ hg ci -m 'mv created created2'
-
-  $ hg mv created2 created3
-
-There's a copy in the working dir:
-
-  $ hg diff --git
-  diff --git a/created2 b/created3
-  rename from created2
-  rename to created3
-
-There's another copy between the original rev and the wd:
-
-  $ hg diff --git -r -2
-  diff --git a/created b/created3
-  rename from created
-  rename to created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
 
 The source of the copy was created after the original rev:
 
   $ hg diff --git -r -3
+  diff --git a/bar b/bar
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
   diff --git a/created3 b/created3
   new file mode 100644
   --- /dev/null
   +++ b/created3
   @@ -0,0 +1,1 @@
   +
+  diff --git a/dst b/dst3
+  rename from dst
+  rename to dst3
+  diff --git a/binfile.bin b/renamed.bin
+  rename from binfile.bin
+  rename to renamed.bin
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
   $ hg ci -m 'mv created2 created3'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 
   $ echo > brand-new
   $ hg add brand-new
   $ hg ci -m 'add brand-new'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg mv brand-new brand-new2
+  brand-new has not been committed yet, so no copy data will be stored for brand-new2.
 
 Created in parent of wd; renamed in the wd:
 
   $ hg diff --git
-  diff --git a/brand-new b/brand-new2
-  rename from brand-new
-  rename to brand-new2
+  diff --git a/bar b/bar
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
+  diff --git a/brand-new2 b/brand-new2
+  new file mode 100644
+  --- /dev/null
+  +++ b/brand-new2
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
 
 Created between r1 and parent of wd; renamed in the wd:
 
   $ hg diff --git -r -2
+  diff --git a/bar b/bar
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
   diff --git a/brand-new2 b/brand-new2
   new file mode 100644
   --- /dev/null
   +++ b/brand-new2
   @@ -0,0 +1,1 @@
   +
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
   $ hg ci -m 'mv brand-new brand-new2'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 One file is copied to many destinations and removed:
 
   $ hg cp brand-new2 brand-new3
+  brand-new2 has not been committed yet, so no copy data will be stored for brand-new3.
   $ hg mv brand-new2 brand-new3-2
+  brand-new2 has not been committed yet, so no copy data will be stored for brand-new3-2.
   $ hg ci -m 'multiple renames/copies'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg diff --git -r -2 -r -1
-  diff --git a/brand-new2 b/brand-new3
-  rename from brand-new2
-  rename to brand-new3
-  diff --git a/brand-new2 b/brand-new3-2
-  copy from brand-new2
-  copy to brand-new3-2
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,1 +1,2 @@
+   start
+  +
 
 Reversed:
 
   $ hg diff --git -r -1 -r -2
-  diff --git a/brand-new3-2 b/brand-new2
-  rename from brand-new3-2
-  rename to brand-new2
-  diff --git a/brand-new3 b/brand-new3
-  deleted file mode 100644
-  --- a/brand-new3
-  +++ /dev/null
-  @@ -1,1 +0,0 @@
+  diff --git a/start b/start
+  --- a/start
+  +++ b/start
+  @@ -1,2 +1,1 @@
+   start
   -
 
 There should be a trailing TAB if there are spaces in the file name:
@@ -586,6 +795,35 @@
   $ echo foo > 'with spaces'
   $ hg add 'with spaces'
   $ hg diff --git
+  diff --git a/bar b/bar
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
+  diff --git a/brand-new3 b/brand-new3
+  new file mode 100644
+  --- /dev/null
+  +++ b/brand-new3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/brand-new3-2 b/brand-new3-2
+  new file mode 100644
+  --- /dev/null
+  +++ b/brand-new3-2
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
   diff --git a/with spaces b/with spaces
   new file mode 100644
   --- /dev/null
@@ -593,24 +831,66 @@
   @@ -0,0 +1,1 @@
   +foo
   $ hg ci -m 'add filename with spaces'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Additions should be properly marked even in the middle of a merge
 
   $ hg up -r -2
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "New File" >> inmerge
   $ hg add inmerge
   $ hg ci -m "file in merge"
-  created new head
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up 23
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  abort: unknown revision '23'
+  [10]
   $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  abort: nothing to merge
+  (use 'hg update' instead)
+  [255]
   $ hg diff -g
+  diff --git a/bar b/bar
+  new file mode 100644
+  --- /dev/null
+  +++ b/bar
+  @@ -0,0 +1,3 @@
+  +a
+  +b
+  +c
+  diff --git a/brand-new3 b/brand-new3
+  new file mode 100644
+  --- /dev/null
+  +++ b/brand-new3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/brand-new3-2 b/brand-new3-2
+  new file mode 100644
+  --- /dev/null
+  +++ b/brand-new3-2
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/created3 b/created3
+  new file mode 100644
+  --- /dev/null
+  +++ b/created3
+  @@ -0,0 +1,1 @@
+  +
+  diff --git a/dst2 b/dst3
+  rename from dst2
+  rename to dst3
   diff --git a/inmerge b/inmerge
   new file mode 100644
   --- /dev/null
   +++ b/inmerge
   @@ -0,0 +1,1 @@
   +New File
+  diff --git a/with spaces b/with spaces
+  new file mode 100644
+  --- /dev/null
+  +++ b/with spaces	
+  @@ -0,0 +1,1 @@
+  +foo
# Timout reached for process 1118303 

ERROR: test-git-export.t output changed
!# Ret was: 0 (test-git-export.t) 
test-clone-stream-format.t#stream-bundle2
test-clone-stream-format.t#stream-bundle2 ... # Test test-clone-stream-format.t#stream-bundle2 
# Running sh "/tmp/hgtests.qiewis6n/child346/test-clone-stream-format.t-stream-bundle2.sh" 
# Timout reached for process 1118452 
# Ret was: 0 (test-rebase-interruptions.t) 
ok
test-clone-stream-format.t#stream-legacy
test-clone-stream-format.t#stream-legacy ... # Test test-clone-stream-format.t#stream-legacy 
# Running sh "/tmp/hgtests.qiewis6n/child347/test-clone-stream-format.t-stream-legacy.sh" 
# Ret was: 0 (test-lfs-largefiles.t) 
ok
test-hgweb-empty.t
test-hgweb-empty.t ... # Test test-hgweb-empty.t 
# Timout reached for process 1118730 
# Running sh "/tmp/hgtests.qiewis6n/child348/test-hgweb-empty.t.sh" 
# Ret was: 0 (test-rebase-obsolete4.t) 
ok
test-hardlinks.t
test-hardlinks.t ... # Test test-hardlinks.t 
# Timout reached for process 1118545 
# Running sh "/tmp/hgtests.qiewis6n/child349/test-hardlinks.t.sh" 
# Killing daemon process 1119020 
# Timout reached for process 1119009 
# Daemon process 1119020 is stuck - really killing it 
# Ret was: 0 (test-hgweb-empty.t) 
ok
test-copies-in-changeset.t#extra
test-copies-in-changeset.t#extra ... # Test test-copies-in-changeset.t#extra 
# Running sh "/tmp/hgtests.qiewis6n/child350/test-copies-in-changeset.t-extra.sh" 
# Timout reached for process 1119042 
# Ret was: 0 (test-hardlinks.t) 
ok
test-copies-in-changeset.t#sidedata
test-copies-in-changeset.t#sidedata ... # Test test-copies-in-changeset.t#sidedata 
# Running sh "/tmp/hgtests.qiewis6n/child351/test-copies-in-changeset.t-sidedata.sh" 
# Ret was: 0 (test-copies-in-changeset.t#extra) 
ok
test-pager.t
test-pager.t ... # Test test-pager.t 
# Timout reached for process 1119074 
# Running sh "/tmp/hgtests.qiewis6n/child352/test-pager.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-clone-stream-format.t
+++ /<<PKGBUILDDIR>>/tests/test-clone-stream-format.t#stream-bundle2.err
@@ -84,7 +84,12 @@
   adding undo.i
   adding undo.n
   adding undo.py
+  Bus error
+  [135]
   $ hg debugbuilddag .+5000 --from-existing
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ ls -1 .hg/store/00changelog*
   .hg/store/00changelog-*.nd (glob)
   .hg/store/00changelog.d
@@ -106,10 +111,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-store -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -152,10 +157,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-fncache -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -197,10 +202,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-dotencode -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -259,10 +264,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-share-safe -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -305,10 +310,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-persistent-nodemap -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS

ERROR: test-clone-stream-format.t#stream-bundle2 output changed
!# Timout reached for process 1118853 
# Ret was: 0 (test-clone-stream-format.t#stream-bundle2) 
test-rebase-abort.t#abortcommand#continuecommand
test-rebase-abort.t#abortcommand#continuecommand ... # Test test-rebase-abort.t#abortcommand#continuecommand 
# Running sh "/tmp/hgtests.qiewis6n/child353/test-rebase-abort.t-abortcommand-continuecommand.sh" 
# Timout reached for process 1118915 

--- /<<PKGBUILDDIR>>/tests/test-clone-stream-format.t
+++ /<<PKGBUILDDIR>>/tests/test-clone-stream-format.t#stream-legacy.err
@@ -84,7 +84,12 @@
   adding undo.i
   adding undo.n
   adding undo.py
+  Bus error
+  [135]
   $ hg debugbuilddag .+5000 --from-existing
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ ls -1 .hg/store/00changelog*
   .hg/store/00changelog-*.nd (glob)
   .hg/store/00changelog.d
@@ -106,10 +111,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-store -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -152,10 +157,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-fncache -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -197,10 +202,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-dotencode -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -259,10 +264,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-share-safe -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS
@@ -305,10 +310,10 @@
   adding changesets
   adding manifests
   adding file changes
-  added 5004 changesets with 1088 changes to 1088 files (+1 heads)
-  new changesets 96ee1d7354c4:06ddac466af5
-  updating to branch default
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  added 2 changesets with 1025 changes to 1025 files
+  new changesets 96ee1d7354c4:c17445101a72
+  updating to branch default
+  1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg verify -R server-no-persistent-nodemap -q
   $ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
   $ cat hg-1.pid > $DAEMON_PIDS

ERROR: test-clone-stream-format.t#stream-legacy output changed
!# Ret was: 0 (test-clone-stream-format.t#stream-legacy) 
test-rebase-abort.t#abortcommand#continueflag
test-rebase-abort.t#abortcommand#continueflag ... # Test test-rebase-abort.t#abortcommand#continueflag 
# Running sh "/tmp/hgtests.qiewis6n/child354/test-rebase-abort.t-abortcommand-continueflag.sh" 
# Ret was: 0 (test-pager.t) 
ok
test-rebase-abort.t#abortflag#continuecommand
test-rebase-abort.t#abortflag#continuecommand ... # Test test-rebase-abort.t#abortflag#continuecommand 
# Timout reached for process 1119628 
# Running sh "/tmp/hgtests.qiewis6n/child355/test-rebase-abort.t-abortflag-continuecommand.sh" 
# Ret was: 0 (test-copies-in-changeset.t#sidedata) 
ok
test-rebase-abort.t#abortflag#continueflag
test-rebase-abort.t#abortflag#continueflag ... # Test test-rebase-abort.t#abortflag#continueflag 
# Timout reached for process 1119414 
# Running sh "/tmp/hgtests.qiewis6n/child356/test-rebase-abort.t-abortflag-continueflag.sh" 
# Ret was: 0 (test-rebase-abort.t#abortcommand#continuecommand) 
ok
test-rhg.t
test-rhg.t ... # Test test-rhg.t 
# Timout reached for process 1119702 
# Running sh "/tmp/hgtests.qiewis6n/child357/test-rhg.t.sh" 
skipped missing feature: running with rhg as 'hg'
# Ret was: 80 (test-rhg.t) 
test-clone-pull-corruption.t
test-clone-pull-corruption.t ... # Test test-clone-pull-corruption.t 
# Running sh "/tmp/hgtests.qiewis6n/child358/test-clone-pull-corruption.t.sh" 
# Timout reached for process 1120327 
# Ret was: 0 (test-rebase-abort.t#abortcommand#continueflag) 
ok
test-merge1.t
test-merge1.t ... # Test test-merge1.t 
# Timout reached for process 1119776 
# Running sh "/tmp/hgtests.qiewis6n/child359/test-merge1.t.sh" 
# Ret was: 0 (test-clone-pull-corruption.t) 
ok
test-convert-mtn.t
test-convert-mtn.t ... # Test test-convert-mtn.t 
# Timout reached for process 1120331 
# Running sh "/tmp/hgtests.qiewis6n/child360/test-convert-mtn.t.sh" 
skipped missing feature: monotone client (>= 1.0)
# Ret was: 80 (test-convert-mtn.t) 
test-verify.t
test-verify.t ... # Test test-verify.t 
# Timout reached for process 1120448 
# Running sh "/tmp/hgtests.qiewis6n/child361/test-verify.t.sh" 
# Ret was: 0 (test-rebase-abort.t#abortflag#continuecommand) 
ok
test-single-head.t
test-single-head.t ... # Test test-single-head.t 
# Running sh "/tmp/hgtests.qiewis6n/child362/test-single-head.t.sh" 
# Timout reached for process 1119968 
# Ret was: 0 (test-rebase-abort.t#abortflag#continueflag) 
ok
test-mq-guards.t
test-mq-guards.t ... # Test test-mq-guards.t 
# Running sh "/tmp/hgtests.qiewis6n/child363/test-mq-guards.t.sh" 
# Timout reached for process 1120011 
# Ret was: 0 (test-verify.t) 
ok
test-narrow-shallow-merges.t
test-narrow-shallow-merges.t ... # Test test-narrow-shallow-merges.t 
# Timout reached for process 1120467 
# Running sh "/tmp/hgtests.qiewis6n/child364/test-narrow-shallow-merges.t.sh" 
# Timout reached for process 1120397 
# Ret was: 0 (test-merge1.t) 
ok
test-convert-svn-tags.t
test-convert-svn-tags.t ... # Test test-convert-svn-tags.t 
# Running sh "/tmp/hgtests.qiewis6n/child365/test-convert-svn-tags.t.sh" 
skipped missing feature: subversion python bindings
# Ret was: 80 (test-convert-svn-tags.t) 
test-hghave.t
test-hghave.t ... # Test test-hghave.t 
# Running sh "/tmp/hgtests.qiewis6n/child366/test-hghave.t.sh" 
# Timout reached for process 1120928 
# Ret was: 0 (test-single-head.t) 
ok
test-qrecord.t
test-qrecord.t ... # Test test-qrecord.t 
# Running sh "/tmp/hgtests.qiewis6n/child367/test-qrecord.t.sh" 
# Timout reached for process 1120564 
# Ret was: 0 (test-hghave.t) 
ok
test-mq-subrepo-svn.t
test-mq-subrepo-svn.t ... # Test test-mq-subrepo-svn.t 
# Timout reached for process 1120932 
# Running sh "/tmp/hgtests.qiewis6n/child368/test-mq-subrepo-svn.t.sh" 
skipped missing feature: subversion client and admin tools >= 1.3
# Ret was: 80 (test-mq-subrepo-svn.t) 
test-rebase-parameters.t
test-rebase-parameters.t ... # Test test-rebase-parameters.t 
# Running sh "/tmp/hgtests.qiewis6n/child369/test-rebase-parameters.t.sh" 
# Timout reached for process 1121052 
# Ret was: 0 (test-qrecord.t) 
ok
test-revset-legacy-lookup.t
test-revset-legacy-lookup.t ... # Test test-revset-legacy-lookup.t 
# Running sh "/tmp/hgtests.qiewis6n/child370/test-revset-legacy-lookup.t.sh" 
# Timout reached for process 1120947 
# Timout reached for process 1120711 
# Ret was: 0 (test-narrow-shallow-merges.t) 
ok
test-copies-unrelated.t#changeset
test-copies-unrelated.t#changeset ... # Test test-copies-unrelated.t#changeset 
# Running sh "/tmp/hgtests.qiewis6n/child371/test-copies-unrelated.t-changeset.sh" 
# Ret was: 0 (test-mq-guards.t) 
ok
test-copies-unrelated.t#compatibility
test-copies-unrelated.t#compatibility ... # Test test-copies-unrelated.t#compatibility 
# Timout reached for process 1120628 
# Running sh "/tmp/hgtests.qiewis6n/child372/test-copies-unrelated.t-compatibility.sh" 
# Ret was: 0 (test-rebase-parameters.t) 
ok
test-copies-unrelated.t#filelog
test-copies-unrelated.t#filelog ... # Test test-copies-unrelated.t#filelog 
# Running sh "/tmp/hgtests.qiewis6n/child373/test-copies-unrelated.t-filelog.sh" 
# Timout reached for process 1121056 
# Ret was: 0 (test-revset-legacy-lookup.t) 
ok
test-copies-unrelated.t#sidedata
test-copies-unrelated.t#sidedata ... # Test test-copies-unrelated.t#sidedata 
# Timout reached for process 1121147 
# Running sh "/tmp/hgtests.qiewis6n/child374/test-copies-unrelated.t-sidedata.sh" 
# Ret was: 0 (test-copies-unrelated.t#changeset) 
ok
test-sparse.t
test-sparse.t ... # Test test-sparse.t 
# Timout reached for process 1121243 
# Running sh "/tmp/hgtests.qiewis6n/child375/test-sparse.t.sh" 
# Ret was: 0 (test-copies-unrelated.t#compatibility) 
ok
test-branch-change.t
test-branch-change.t ... # Test test-branch-change.t 
# Running sh "/tmp/hgtests.qiewis6n/child376/test-branch-change.t.sh" 
# Timout reached for process 1121390 
# Ret was: 0 (test-copies-unrelated.t#filelog) 
ok
test-export.t
test-export.t ... # Test test-export.t 
# Running sh "/tmp/hgtests.qiewis6n/child377/test-export.t.sh" 
# Timout reached for process 1121466 
# Ret was: 0 (test-copies-unrelated.t#sidedata) 
ok
test-issue3084.t
test-issue3084.t ... # Test test-issue3084.t 
# Timout reached for process 1121505 
# Running sh "/tmp/hgtests.qiewis6n/child378/test-issue3084.t.sh" 
# Timout reached for process 1121905 
# Ret was: 0 (test-sparse.t) 
ok
test-narrow-patterns.t
test-narrow-patterns.t ... # Test test-narrow-patterns.t 
# Running sh "/tmp/hgtests.qiewis6n/child379/test-narrow-patterns.t.sh" 
# Ret was: 0 (test-export.t) 
ok
test-merge-no-file-change.t
test-merge-no-file-change.t ... # Test test-merge-no-file-change.t 
# Timout reached for process 1122159 
# Running sh "/tmp/hgtests.qiewis6n/child380/test-merge-no-file-change.t.sh" 
# Timout reached for process 1122081 
# Ret was: 0 (test-branch-change.t) 
ok
test-journal.t
test-journal.t ... # Test test-journal.t 
# Running sh "/tmp/hgtests.qiewis6n/child381/test-journal.t.sh" 
# Timout reached for process 1122402 

--- /<<PKGBUILDDIR>>/tests/test-narrow-patterns.t
+++ /<<PKGBUILDDIR>>/tests/test-narrow-patterns.t.err
@@ -78,14 +78,8 @@
   > --exclude dir1/dirB \
   > --exclude dir2/dirA \
   > --exclude dir2/dirB
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 6 changesets with 4 changes to 4 files
-  new changesets *:* (glob)
-  updating to branch default
-  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  Bus error
+  [135]
 
   $ cd narrow
   $ hg tracked
@@ -96,329 +90,107 @@
   X path:dir2/dirA
   X path:dir2/dirB
   $ hg manifest -r tip
-  dir1/bar
-  dir1/dirA/bar
-  dir1/dirA/foo
-  dir1/dirB/bar
-  dir1/dirB/foo
-  dir1/foo
-  dir2/bar
-  dir2/dirA/bar
-  dir2/dirA/foo
-  dir2/dirB/bar
-  dir2/dirB/foo
-  dir2/foo
-  root
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/foo
-  dir2
-  dir2/bar
-  dir2/foo
-  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  5 c87ca422d521... dir1/dirA/foo
-  |
-  o  4 33227af02764 dir2/bar
-  |
-  o  3 5e1f9d8d7c69 dir2/foo
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
+  $ find * | sort
+  find: '*': $ENOENT$
+  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
 
 widen the narrow checkout
 
   $ hg tracked --removeexclude dir1/dirA
-  comparing with ssh://user@dummy/master
-  searching for changes
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 9 changesets with 6 changes to 10 files
-  $ hg tracked
-  I path:dir1
-  I path:dir2
-  X path:dir1/dirB
-  X path:dir2/dirA
-  X path:dir2/dirB
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/dirA
-  dir1/dirA/bar
-  dir1/dirA/foo
-  dir1/foo
-  dir2
-  dir2/bar
-  dir2/foo
+  comparing with default
+  abort: repository default not found
+  [255]
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
+  $ find * | sort
+  find: '*': $ENOENT$
 
 #if execbit
   $ test -x dir1/dirA/foo && echo executable
-  executable
+  [1]
   $ test -x dir1/dirA/bar || echo not executable
   not executable
 #endif
 
   $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  8 c87ca422d521 dir1/dirA/foo
-  |
-  o  7 951b8a83924e... dir2/dirB/bar
-  |
-  o  6 623466a5f475 dir1/dirA/bar
-  |
-  o  5 06ff3a5be997 dir1/dirA/foo
-  |
-  o  4 33227af02764 dir2/bar
-  |
-  o  3 5e1f9d8d7c69 dir2/foo
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
 
 widen narrow spec again, but exclude a file in previously included spec
 
   $ hg tracked --removeexclude dir2/dirB --addexclude dir1/dirA/bar
-  comparing with ssh://user@dummy/master
-  searching for changes
-  looking for local changes to affected paths
-  deleting data/dir1/dirA/bar.i (reporevlogstore !)
+  comparing with default
+  abort: repository default not found
   deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
   deleting data/dir1/dirA/bar/index (reposimplestore !)
-  deleting unwanted files from working copy
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 11 changesets with 7 changes to 12 files
-  $ hg tracked
-  I path:dir1
-  I path:dir2
-  X path:dir1/dirA/bar
-  X path:dir1/dirB
-  X path:dir2/dirA
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/dirA
-  dir1/dirA/foo
-  dir1/foo
-  dir2
-  dir2/bar
-  dir2/dirB
-  dir2/dirB/bar
-  dir2/dirB/foo
-  dir2/foo
-  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  10 c87ca422d521 dir1/dirA/foo
-  |
-  o  9 951b8a83924e dir2/dirB/bar
-  |
-  o  8 01ae5a51b563 dir2/dirB/foo
-  |
-  o  7 5eababdf0ac5... dir2/dirA/bar
-  |
-  o  6 623466a5f475... dir1/dirA/bar
-  |
-  o  5 06ff3a5be997 dir1/dirA/foo
-  |
-  o  4 33227af02764 dir2/bar
-  |
-  o  3 5e1f9d8d7c69 dir2/foo
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
+  [255]
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
+  $ find * | sort
+  find: '*': $ENOENT$
+  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
 
 widen narrow spec yet again, excluding a directory in previous spec
 
   $ hg tracked --removeexclude dir2/dirA --addexclude dir1/dirA
-  comparing with ssh://user@dummy/master
-  searching for changes
-  looking for local changes to affected paths
-  deleting data/dir1/dirA/foo.i (reporevlogstore !)
+  comparing with default
+  abort: repository default not found
   deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
   deleting data/dir1/dirA/foo/index (reposimplestore !)
-  deleting unwanted files from working copy
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 13 changesets with 8 changes to 14 files
-  $ hg tracked
-  I path:dir1
-  I path:dir2
-  X path:dir1/dirA
-  X path:dir1/dirA/bar
-  X path:dir1/dirB
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/foo
-  dir2
-  dir2/bar
-  dir2/dirA
-  dir2/dirA/bar
-  dir2/dirA/foo
-  dir2/dirB
-  dir2/dirB/bar
-  dir2/dirB/foo
-  dir2/foo
-  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  12 c87ca422d521... dir1/dirA/foo
-  |
-  o  11 951b8a83924e dir2/dirB/bar
-  |
-  o  10 01ae5a51b563 dir2/dirB/foo
-  |
-  o  9 5eababdf0ac5 dir2/dirA/bar
-  |
-  o  8 99d690663739 dir2/dirA/foo
-  |
-  o  7 8e80155d5445... dir1/dirB/bar
-  |
-  o  6 623466a5f475... dir1/dirA/bar
-  |
-  o  5 06ff3a5be997... dir1/dirA/foo
-  |
-  o  4 33227af02764 dir2/bar
-  |
-  o  3 5e1f9d8d7c69 dir2/foo
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
+  [255]
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
+  $ find * | sort
+  find: '*': $ENOENT$
+  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
 
 include a directory that was previously explicitly excluded
 
   $ hg tracked --removeexclude dir1/dirA
-  comparing with ssh://user@dummy/master
-  searching for changes
-  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 13 changesets with 9 changes to 17 files
-  $ hg tracked
-  I path:dir1
-  I path:dir2
-  X path:dir1/dirA/bar
-  X path:dir1/dirB
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/dirA
-  dir1/dirA/foo
-  dir1/foo
-  dir2
-  dir2/bar
-  dir2/dirA
-  dir2/dirA/bar
-  dir2/dirA/foo
-  dir2/dirB
-  dir2/dirB/bar
-  dir2/dirB/foo
-  dir2/foo
-  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  12 c87ca422d521 dir1/dirA/foo
-  |
-  o  11 951b8a83924e dir2/dirB/bar
-  |
-  o  10 01ae5a51b563 dir2/dirB/foo
-  |
-  o  9 5eababdf0ac5 dir2/dirA/bar
-  |
-  o  8 99d690663739 dir2/dirA/foo
-  |
-  o  7 8e80155d5445... dir1/dirB/bar
-  |
-  o  6 623466a5f475... dir1/dirA/bar
-  |
-  o  5 06ff3a5be997 dir1/dirA/foo
-  |
-  o  4 33227af02764 dir2/bar
-  |
-  o  3 5e1f9d8d7c69 dir2/foo
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
+  comparing with default
+  abort: repository default not found
+  [255]
+  $ hg tracked
+  I path:dir1
+  I path:dir2
+  X path:dir1/dirA
+  X path:dir1/dirB
+  X path:dir2/dirA
+  X path:dir2/dirB
+  $ find * | sort
+  find: '*': $ENOENT$
+  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
 
   $ cd ..
 
 clone a narrow portion of the master, such that we can widen it later
 
   $ hg clone --narrow ssh://user@dummy/master narrow2 --include dir1/dirA
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 5 changesets with 2 changes to 2 files
-  new changesets *:* (glob)
-  updating to branch default
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  Bus error
+  [135]
   $ cd narrow2
   $ find * | sort
-  dir1
-  dir1/dirA
-  dir1/dirA/bar
-  dir1/dirA/foo
+  find: '*': $ENOENT$
   $ hg tracked --addinclude dir1
-  comparing with ssh://user@dummy/master
-  searching for changes
-  saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
-  adding changesets
-  adding manifests
-  adding file changes
-  added 10 changesets with 6 changes to 8 files
-  $ find * | sort
-  dir1
-  dir1/bar
-  dir1/dirA
-  dir1/dirA/bar
-  dir1/dirA/foo
-  dir1/dirB
-  dir1/dirB/bar
-  dir1/dirB/foo
-  dir1/foo
-  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
-  @  9 c87ca422d521 dir1/dirA/foo
-  |
-  o  8 951b8a83924e... dir2/dirB/bar
-  |
-  o  7 8e80155d5445 dir1/dirB/bar
-  |
-  o  6 406760310428 dir1/dirB/foo
-  |
-  o  5 623466a5f475 dir1/dirA/bar
-  |
-  o  4 06ff3a5be997 dir1/dirA/foo
-  |
-  o  3 33227af02764... dir2/bar
-  |
-  o  2 594bc4b13d4a dir1/bar
-  |
-  o  1 47f480a08324 dir1/foo
-  |
-  o  0 2a4f0c3b67da... root
-  
+  comparing with default
+  abort: repository default not found
+  [255]
+  $ find * | sort
+  find: '*': $ENOENT$
+  $ hg log -G -T '{rev} {node|short}{if(ellipsis, "...")} {files}\n'
 
 Illegal patterns are rejected
 
@@ -434,7 +206,6 @@
 
   $ cat .hg/store/narrowspec
   [include]
-  path:dir1
   path:dir1/dirA
   [exclude]
 

ERROR: test-narrow-patterns.t output changed
!# Ret was: 0 (test-narrow-patterns.t) 
test-rebase-rename.t
test-rebase-rename.t ... # Test test-rebase-rename.t 
# Running sh "/tmp/hgtests.qiewis6n/child382/test-rebase-rename.t.sh" 
# Ret was: 0 (test-issue3084.t) 
ok
test-mq-qpush-fail.t
test-mq-qpush-fail.t ... # Test test-mq-qpush-fail.t 
# Running sh "/tmp/hgtests.qiewis6n/child383/test-mq-qpush-fail.t.sh" 
# Ret was: 0 (test-journal.t) 
ok
test-commit-interactive-curses.t
test-commit-interactive-curses.t ... # Test test-commit-interactive-curses.t 
# Timout reached for process 1122207 
# Timout reached for process 1122562 
# Running sh "/tmp/hgtests.qiewis6n/child384/test-commit-interactive-curses.t.sh" 
# Ret was: 0 (test-merge-no-file-change.t) 
ok
test-rebase-dest.t
test-rebase-dest.t ... # Test test-rebase-dest.t 
# Running sh "/tmp/hgtests.qiewis6n/child385/test-rebase-dest.t.sh" 
# Timout reached for process 1122434 
# Ret was: 0 (test-commit-interactive-curses.t) 
ok
test-rebase-pull.t
test-rebase-pull.t ... # Test test-rebase-pull.t 
# Running sh "/tmp/hgtests.qiewis6n/child386/test-rebase-pull.t.sh" 
# Timout reached for process 1122767 
# Ret was: 0 (test-rebase-rename.t) 
ok
test-exchange-obsmarkers-case-A1.t
test-exchange-obsmarkers-case-A1.t ... # Test test-exchange-obsmarkers-case-A1.t 
# Running sh "/tmp/hgtests.qiewis6n/child387/test-exchange-obsmarkers-case-A1.t.sh" 
# Timout reached for process 1122701 
# Ret was: 0 (test-mq-qpush-fail.t) 
ok
test-copy.t
test-copy.t ... # Test test-copy.t 
# Timout reached for process 1122755 
# Running sh "/tmp/hgtests.qiewis6n/child388/test-copy.t.sh" 
# Ret was: 0 (test-rebase-pull.t) 
ok
test-revert-interactive.t
test-revert-interactive.t ... # Test test-revert-interactive.t 
# Running sh "/tmp/hgtests.qiewis6n/child389/test-revert-interactive.t.sh" 
# Timout reached for process 1123103 
# Ret was: 0 (test-rebase-dest.t) 
ok
test-rebase-newancestor.t
test-rebase-newancestor.t ... # Test test-rebase-newancestor.t 
# Running sh "/tmp/hgtests.qiewis6n/child390/test-rebase-newancestor.t.sh" 
# Timout reached for process 1123057 
# Timout reached for process 1123148 
# Ret was: 0 (test-exchange-obsmarkers-case-A1.t) 
ok
test-help-hide.t
test-help-hide.t ... # Test test-help-hide.t 
# Running sh "/tmp/hgtests.qiewis6n/child391/test-help-hide.t.sh" 
# Ret was: 0 (test-help-hide.t) 
ok
test-import-bypass.t
test-import-bypass.t ... # Test test-import-bypass.t 
# Timout reached for process 1123552 
# Running sh "/tmp/hgtests.qiewis6n/child392/test-import-bypass.t.sh" 
# Ret was: 0 (test-revert-interactive.t) 
ok
test-persistent-nodemap-stream-clone.t#stream-v2
test-persistent-nodemap-stream-clone.t#stream-v2 ... # Test test-persistent-nodemap-stream-clone.t#stream-v2 
# Timout reached for process 1123498 
# Running sh "/tmp/hgtests.qiewis6n/child393/test-persistent-nodemap-stream-clone.t-stream-v2.sh" 
# Timout reached for process 1123570 
# Ret was: 0 (test-import-bypass.t) 
ok
test-persistent-nodemap-stream-clone.t#stream-v3
test-persistent-nodemap-stream-clone.t#stream-v3 ... # Test test-persistent-nodemap-stream-clone.t#stream-v3 
# Running sh "/tmp/hgtests.qiewis6n/child394/test-persistent-nodemap-stream-clone.t-stream-v3.sh" 
# Timout reached for process 1123384 
# Ret was: 0 (test-copy.t) 
ok
test-narrow-widen-no-ellipsis.t#flat
test-narrow-widen-no-ellipsis.t#flat ... # Test test-narrow-widen-no-ellipsis.t#flat 
# Running sh "/tmp/hgtests.qiewis6n/child395/test-narrow-widen-no-ellipsis.t-flat.sh" 
# Ret was: 0 (test-rebase-newancestor.t) 
ok
test-narrow-widen-no-ellipsis.t#tree
test-narrow-widen-no-ellipsis.t#tree ... # Test test-narrow-widen-no-ellipsis.t#tree 
# Timout reached for process 1123535 
# Running sh "/tmp/hgtests.qiewis6n/child396/test-narrow-widen-no-ellipsis.t-tree.sh" 
# Timout reached for process 1123940 
# Ret was: 0 (test-narrow-widen-no-ellipsis.t#flat) 
ok
test-merge-partial-tool.t
test-merge-partial-tool.t ... # Test test-merge-partial-tool.t 
# Running sh "/tmp/hgtests.qiewis6n/child397/test-merge-partial-tool.t.sh" 
# Timout reached for process 1123958 
# Ret was: 0 (test-narrow-widen-no-ellipsis.t#tree) 
ok
test-parse-date.t
test-parse-date.t ... # Test test-parse-date.t 
# Running sh "/tmp/hgtests.qiewis6n/child398/test-parse-date.t.sh" 
# Ret was: 0 (test-merge-partial-tool.t) 
ok
test-treediscovery-legacy.t
test-treediscovery-legacy.t ... # Test test-treediscovery-legacy.t 
# Running sh "/tmp/hgtests.qiewis6n/child399/test-treediscovery-legacy.t.sh" 
# Timout reached for process 1129949 
# Ret was: 0 (test-parse-date.t) 
ok
test-bundle-phases.t
test-bundle-phases.t ... # Test test-bundle-phases.t 
# Running sh "/tmp/hgtests.qiewis6n/child400/test-bundle-phases.t.sh" 
# Timout reached for process 1130337 
# Ret was: 0 (test-treediscovery-legacy.t) 
ok
test-push.t
test-push.t ... # Test test-push.t 
# Timout reached for process 1133007 
# Running sh "/tmp/hgtests.qiewis6n/child401/test-push.t.sh" 
# Timout reached for process 1135893 
# Ret was: 0 (test-bundle-phases.t) 
ok
test-rebase-cache.t
test-rebase-cache.t ... # Test test-rebase-cache.t 
# Running sh "/tmp/hgtests.qiewis6n/child402/test-rebase-cache.t.sh" 
# Ret was: 0 (test-push.t) 
ok
test-releasenotes-formatting.t
test-releasenotes-formatting.t ... # Test test-releasenotes-formatting.t 
# Timout reached for process 1138572 
# Running sh "/tmp/hgtests.qiewis6n/child403/test-releasenotes-formatting.t.sh" 
skipped missing feature: Fuzzy string matching library
# Ret was: 80 (test-releasenotes-formatting.t) 
test-merge-exec.t
test-merge-exec.t ... # Test test-merge-exec.t 
# Timout reached for process 1143786 
# Running sh "/tmp/hgtests.qiewis6n/child404/test-merge-exec.t.sh" 
# Timout reached for process 1123825 

--- /<<PKGBUILDDIR>>/tests/test-persistent-nodemap-stream-clone.t
+++ /<<PKGBUILDDIR>>/tests/test-persistent-nodemap-stream-clone.t#stream-v2.err
@@ -32,6 +32,8 @@
 
   $ hg init test-repo --config storage.revlog.persistent-nodemap.slow-path=allow
   $ hg -R test-repo debugbuilddag .+5000 --new-file
+  Bus error
+  [135]
 
 stream clone
 ============
@@ -44,33 +46,17 @@
 No race condition
 
   $ hg clone -U --stream ssh://user@dummy/test-repo stream-clone --debug | grep -E '00(changelog|manifest)'
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (118 KB) (glob)
-  adding [s] 00changelog.d (3?? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
   $ ls -1 stream-clone/.hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
+  ls: cannot access 'stream-clone/.hg/store/': $ENOENT$
+  [1]
   $ hg -R stream-clone debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: repository stream-clone not found
+  [255]
   $ hg verify -R stream-clone
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5001 changesets with 5001 changes to 5001 files
+  abort: repository stream-clone not found
+  [255]
 
 new data appened
 -----------------
@@ -93,17 +79,10 @@
 Check and record file state beforehand
 
   $ f --size test-repo/.hg/store/00changelog*
-  test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
   test-repo/.hg/store/00changelog.d: size=3????? (glob)
-  test-repo/.hg/store/00changelog.i: size=320064
-  test-repo/.hg/store/00changelog.n: size=62
+  test-repo/.hg/store/00changelog.i.a: size=256192
   $ hg -R test-repo debugnodemap --metadata | tee server-metadata.txt
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
 
 Prepare a commit
 
@@ -114,42 +93,28 @@
 
   $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-1 --debug 2>> clone-output | grep -E '00(changelog|manifest)' >> clone-output; touch $HG_TEST_STREAM_WALKED_FILE_3) &
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1
+  file not created after 10 seconds: $TESTTMP/sync_file_walked_1
+  [1]
   $ hg -R test-repo/ commit -m foo
-  created new head
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ touch $HG_TEST_STREAM_WALKED_FILE_2
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
   $ cat clone-output
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (118 KB) (glob)
-  adding [s] 00changelog.d (36? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
 
 Check the result state
 
   $ f --size stream-clone-race-1/.hg/store/00changelog*
-  stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
-  stream-clone-race-1/.hg/store/00changelog.d: size=3????? (glob)
-  stream-clone-race-1/.hg/store/00changelog.i: size=320064
-  stream-clone-race-1/.hg/store/00changelog.n: size=62
+  stream-clone-race-1/.hg/store/00changelog*: file not found
 
   $ hg -R stream-clone-race-1 debugnodemap --metadata | tee client-metadata.txt
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: repository stream-clone-race-1 not found
   $ hg verify -R stream-clone-race-1
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5001 changesets with 5001 changes to 5001 files
+  abort: repository stream-clone-race-1 not found
+  [255]
 
 We get a usable nodemap, so no rewrite would be needed and the metadata should be identical
 (ie: the following diff should be empty)
@@ -158,15 +123,6 @@
 
 #if no-rust no-pure
   $ diff -u server-metadata.txt client-metadata.txt
-  --- server-metadata.txt	* (glob)
-  +++ client-metadata.txt	* (glob)
-  @@ -1,4 +1,4 @@
-  -uid: * (glob)
-  +uid: * (glob)
-   tip-rev: 5000
-   tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-   data-length: 121088
-  [1]
 #else
   $ diff -u server-metadata.txt client-metadata.txt
 #endif
@@ -190,75 +146,121 @@
 Check the initial state
 
   $ f --size test-repo/.hg/store/00changelog*
-  test-repo/.hg/store/00changelog-*.nd: size=121??? (glob)
   test-repo/.hg/store/00changelog.d: size=3????? (glob)
-  test-repo/.hg/store/00changelog.i: size=320128
-  test-repo/.hg/store/00changelog.n: size=62
+  test-repo/.hg/store/00changelog.i.a: size=256192
   $ hg -R test-repo debugnodemap --metadata | tee server-metadata-2.txt
-  uid: * (glob)
-  tip-rev: 5001
-  tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
+  abort: cannot give path to non-revlog
   data-length: 121408 (pure !)
   data-unused: 256 (pure !)
   data-unused: 0.211% (pure !)
   data-length: 121408 (rust !)
   data-unused: 256 (rust !)
   data-unused: 0.211% (rust !)
-  data-length: 121152 (no-pure no-rust !)
-  data-unused: 0 (no-pure no-rust !)
-  data-unused: 0.000% (no-pure no-rust !)
 
 Performe the mix of clone and full refresh of the nodemap, so that the files
 (and filenames) are different between listing time and actual transfer time.
 
   $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-2 --debug 2>> clone-output-2 | grep -E '00(changelog|manifest)' >> clone-output-2; touch $HG_TEST_STREAM_WALKED_FILE_3) &
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1
+  file not created after 10 seconds: $TESTTMP/sync_file_walked_1
+  [1]
   $ rm test-repo/.hg/store/00changelog.n
+  rm: cannot remove 'test-repo/.hg/store/00changelog.n': $ENOENT$
+  [1]
   $ rm test-repo/.hg/store/00changelog-*.nd
+  rm: cannot remove 'test-repo/.hg/store/00changelog-*.nd': $ENOENT$
+  [1]
   $ hg -R test-repo/ debugupdatecache
+  ** Unknown exception encountered with possibly-broken third-party extension "steps" (version N/A)
+  ** which supports versions unknown of Mercurial.
+  ** Please disable "steps" and try your action again.
+  ** If that fixes the bug please report it to the extension author.
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: steps
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4025, in debugupdatecaches
+      repo.updatecaches(caches=repository.CACHES_ALL)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 241, in wrapper
+      return orig(repo.unfiltered(), *args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 2940, in updatecaches
+      for entry in self.store.walk():
+                   ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
   $ touch $HG_TEST_STREAM_WALKED_FILE_2
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
 
 (note: the stream clone code wronly pick the `undo.` files)
 
   $ cat clone-output-2
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (11? KB) (glob)
-  adding [s] 00changelog.d (3?? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
 
 Check the result.
 
   $ f --size stream-clone-race-2/.hg/store/00changelog*
-  stream-clone-race-2/.hg/store/00changelog-*.nd: size=1????? (glob)
-  stream-clone-race-2/.hg/store/00changelog.d: size=3????? (glob)
-  stream-clone-race-2/.hg/store/00changelog.i: size=320128
-  stream-clone-race-2/.hg/store/00changelog.n: size=62
+  stream-clone-race-2/.hg/store/00changelog*: file not found
 
   $ hg -R stream-clone-race-2 debugnodemap --metadata | tee client-metadata-2.txt
-  uid: * (glob)
-  tip-rev: 5001
-  tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
+  abort: repository stream-clone-race-2 not found
   data-length: 121408 (pure !)
   data-unused: 256 (pure !)
   data-unused: 0.211% (pure !)
   data-length: 121408 (rust !)
   data-unused: 256 (rust !)
   data-unused: 0.211% (rust !)
-  data-length: 121152 (no-pure no-rust !)
-  data-unused: 0 (no-pure no-rust !)
-  data-unused: 0.000% (no-pure no-rust !)
   $ hg verify -R stream-clone-race-2
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5002 changesets with 5002 changes to 5002 files
+  abort: repository stream-clone-race-2 not found
+  [255]
 
 We get a usable nodemap, so no rewrite would be needed and the metadata should be identical
 (ie: the following diff should be empty)
@@ -267,15 +269,6 @@
 
 #if no-rust no-pure
   $ diff -u server-metadata-2.txt client-metadata-2.txt
-  --- server-metadata-2.txt	* (glob)
-  +++ client-metadata-2.txt	* (glob)
-  @@ -1,4 +1,4 @@
-  -uid: * (glob)
-  +uid: * (glob)
-   tip-rev: 5001
-   tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
-   data-length: 121152
-  [1]
 #else
   $ diff -u server-metadata-2.txt client-metadata-2.txt
 #endif

ERROR: test-persistent-nodemap-stream-clone.t#stream-v2 output changed
!# Ret was: 0 (test-persistent-nodemap-stream-clone.t#stream-v2) 
test-static-http.t
test-static-http.t ... # Test test-static-http.t 
# Running sh "/tmp/hgtests.qiewis6n/child405/test-static-http.t.sh" 
# Timout reached for process 1123927 

--- /<<PKGBUILDDIR>>/tests/test-persistent-nodemap-stream-clone.t
+++ /<<PKGBUILDDIR>>/tests/test-persistent-nodemap-stream-clone.t#stream-v3.err
@@ -32,6 +32,8 @@
 
   $ hg init test-repo --config storage.revlog.persistent-nodemap.slow-path=allow
   $ hg -R test-repo debugbuilddag .+5000 --new-file
+  Bus error
+  [135]
 
 stream clone
 ============
@@ -44,33 +46,17 @@
 No race condition
 
   $ hg clone -U --stream ssh://user@dummy/test-repo stream-clone --debug | grep -E '00(changelog|manifest)'
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (118 KB) (glob)
-  adding [s] 00changelog.d (3?? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
   $ ls -1 stream-clone/.hg/store/ | grep -E '00(changelog|manifest)(\.n|-.*\.nd)'
-  00changelog-*.nd (glob)
-  00changelog.n
-  00manifest-*.nd (glob)
-  00manifest.n
+  ls: cannot access 'stream-clone/.hg/store/': $ENOENT$
+  [1]
   $ hg -R stream-clone debugnodemap --metadata
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: repository stream-clone not found
+  [255]
   $ hg verify -R stream-clone
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5001 changesets with 5001 changes to 5001 files
+  abort: repository stream-clone not found
+  [255]
 
 new data appened
 -----------------
@@ -93,17 +79,10 @@
 Check and record file state beforehand
 
   $ f --size test-repo/.hg/store/00changelog*
-  test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
   test-repo/.hg/store/00changelog.d: size=3????? (glob)
-  test-repo/.hg/store/00changelog.i: size=320064
-  test-repo/.hg/store/00changelog.n: size=62
+  test-repo/.hg/store/00changelog.i.a: size=256192
   $ hg -R test-repo debugnodemap --metadata | tee server-metadata.txt
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: cannot give path to non-revlog
 
 Prepare a commit
 
@@ -114,42 +93,28 @@
 
   $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-1 --debug 2>> clone-output | grep -E '00(changelog|manifest)' >> clone-output; touch $HG_TEST_STREAM_WALKED_FILE_3) &
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1
+  file not created after 10 seconds: $TESTTMP/sync_file_walked_1
+  [1]
   $ hg -R test-repo/ commit -m foo
-  created new head
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ touch $HG_TEST_STREAM_WALKED_FILE_2
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
   $ cat clone-output
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (118 KB) (glob)
-  adding [s] 00changelog.d (36? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
 
 Check the result state
 
   $ f --size stream-clone-race-1/.hg/store/00changelog*
-  stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
-  stream-clone-race-1/.hg/store/00changelog.d: size=3????? (glob)
-  stream-clone-race-1/.hg/store/00changelog.i: size=320064
-  stream-clone-race-1/.hg/store/00changelog.n: size=62
+  stream-clone-race-1/.hg/store/00changelog*: file not found
 
   $ hg -R stream-clone-race-1 debugnodemap --metadata | tee client-metadata.txt
-  uid: * (glob)
-  tip-rev: 5000
-  tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-  data-length: 121088
-  data-unused: 0
-  data-unused: 0.000%
+  abort: repository stream-clone-race-1 not found
   $ hg verify -R stream-clone-race-1
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5001 changesets with 5001 changes to 5001 files
+  abort: repository stream-clone-race-1 not found
+  [255]
 
 We get a usable nodemap, so no rewrite would be needed and the metadata should be identical
 (ie: the following diff should be empty)
@@ -158,15 +123,6 @@
 
 #if no-rust no-pure
   $ diff -u server-metadata.txt client-metadata.txt
-  --- server-metadata.txt	* (glob)
-  +++ client-metadata.txt	* (glob)
-  @@ -1,4 +1,4 @@
-  -uid: * (glob)
-  +uid: * (glob)
-   tip-rev: 5000
-   tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
-   data-length: 121088
-  [1]
 #else
   $ diff -u server-metadata.txt client-metadata.txt
 #endif
@@ -190,75 +146,121 @@
 Check the initial state
 
   $ f --size test-repo/.hg/store/00changelog*
-  test-repo/.hg/store/00changelog-*.nd: size=121??? (glob)
   test-repo/.hg/store/00changelog.d: size=3????? (glob)
-  test-repo/.hg/store/00changelog.i: size=320128
-  test-repo/.hg/store/00changelog.n: size=62
+  test-repo/.hg/store/00changelog.i.a: size=256192
   $ hg -R test-repo debugnodemap --metadata | tee server-metadata-2.txt
-  uid: * (glob)
-  tip-rev: 5001
-  tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
+  abort: cannot give path to non-revlog
   data-length: 121408 (pure !)
   data-unused: 256 (pure !)
   data-unused: 0.211% (pure !)
   data-length: 121408 (rust !)
   data-unused: 256 (rust !)
   data-unused: 0.211% (rust !)
-  data-length: 121152 (no-pure no-rust !)
-  data-unused: 0 (no-pure no-rust !)
-  data-unused: 0.000% (no-pure no-rust !)
 
 Performe the mix of clone and full refresh of the nodemap, so that the files
 (and filenames) are different between listing time and actual transfer time.
 
   $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-2 --debug 2>> clone-output-2 | grep -E '00(changelog|manifest)' >> clone-output-2; touch $HG_TEST_STREAM_WALKED_FILE_3) &
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1
+  file not created after 10 seconds: $TESTTMP/sync_file_walked_1
+  [1]
   $ rm test-repo/.hg/store/00changelog.n
+  rm: cannot remove 'test-repo/.hg/store/00changelog.n': $ENOENT$
+  [1]
   $ rm test-repo/.hg/store/00changelog-*.nd
+  rm: cannot remove 'test-repo/.hg/store/00changelog-*.nd': $ENOENT$
+  [1]
   $ hg -R test-repo/ debugupdatecache
+  ** Unknown exception encountered with possibly-broken third-party extension "steps" (version N/A)
+  ** which supports versions unknown of Mercurial.
+  ** Please disable "steps" and try your action again.
+  ** If that fixes the bug please report it to the extension author.
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: steps
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/debugcommands.py", line 4025, in debugupdatecaches
+      repo.updatecaches(caches=repository.CACHES_ALL)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 241, in wrapper
+      return orig(repo.unfiltered(), *args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 2940, in updatecaches
+      for entry in self.store.walk():
+                   ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 900, in walk
+      for x in self.top_entries(phase=phase, obsolescence=obsolescence):
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 880, in top_entries
+      yield RevlogStoreEntry(
+            ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/store.py", line 569, in __init__
+      assert b'.i' in details, (path_prefix, details)
+             ^^^^^^^^^^^^^^^^
+  AssertionError: (b'00changelog', {b'.d': 300769})
+  [1]
   $ touch $HG_TEST_STREAM_WALKED_FILE_2
   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
 
 (note: the stream clone code wronly pick the `undo.` files)
 
   $ cat clone-output-2
-  adding [s] 00manifest.n (62 bytes)
-  adding [s] 00manifest-*.nd (118 KB) (glob)
-  adding [s] 00manifest.d (4?? KB) (glob)
-  adding [s] 00manifest.i (313 KB)
-  adding [s] 00changelog.n (62 bytes)
-  adding [s] 00changelog-*.nd (11? KB) (glob)
-  adding [s] 00changelog.d (3?? KB) (glob)
-  adding [s] 00changelog.i (313 KB)
+  abort: stream ended unexpectedly (got 0 bytes, expected 4)
+  remote: AssertionError: (b'00changelog', {b'.d': 300769})
 
 Check the result.
 
   $ f --size stream-clone-race-2/.hg/store/00changelog*
-  stream-clone-race-2/.hg/store/00changelog-*.nd: size=1????? (glob)
-  stream-clone-race-2/.hg/store/00changelog.d: size=3????? (glob)
-  stream-clone-race-2/.hg/store/00changelog.i: size=320128
-  stream-clone-race-2/.hg/store/00changelog.n: size=62
+  stream-clone-race-2/.hg/store/00changelog*: file not found
 
   $ hg -R stream-clone-race-2 debugnodemap --metadata | tee client-metadata-2.txt
-  uid: * (glob)
-  tip-rev: 5001
-  tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
+  abort: repository stream-clone-race-2 not found
   data-length: 121408 (pure !)
   data-unused: 256 (pure !)
   data-unused: 0.211% (pure !)
   data-length: 121408 (rust !)
   data-unused: 256 (rust !)
   data-unused: 0.211% (rust !)
-  data-length: 121152 (no-pure no-rust !)
-  data-unused: 0 (no-pure no-rust !)
-  data-unused: 0.000% (no-pure no-rust !)
   $ hg verify -R stream-clone-race-2
-  checking changesets
-  checking manifests
-  crosschecking files in changesets and manifests
-  checking files
-  checking dirstate
-  checked 5002 changesets with 5002 changes to 5002 files
+  abort: repository stream-clone-race-2 not found
+  [255]
 
 We get a usable nodemap, so no rewrite would be needed and the metadata should be identical
 (ie: the following diff should be empty)
@@ -267,15 +269,6 @@
 
 #if no-rust no-pure
   $ diff -u server-metadata-2.txt client-metadata-2.txt
-  --- server-metadata-2.txt	* (glob)
-  +++ client-metadata-2.txt	* (glob)
-  @@ -1,4 +1,4 @@
-  -uid: * (glob)
-  +uid: * (glob)
-   tip-rev: 5001
-   tip-node: e63c23eaa88ae77967edcf4ea194d31167c478b0
-   data-length: 121152
-  [1]
 #else
   $ diff -u server-metadata-2.txt client-metadata-2.txt
 #endif

ERROR: test-persistent-nodemap-stream-clone.t#stream-v3 output changed
!# Ret was: 0 (test-persistent-nodemap-stream-clone.t#stream-v3) 
test-unamend.t
test-unamend.t ... # Test test-unamend.t 
# Running sh "/tmp/hgtests.qiewis6n/child406/test-unamend.t.sh" 
# Timout reached for process 1144665 
# Ret was: 0 (test-static-http.t) 
ok
test-mq-qrefresh.t
test-mq-qrefresh.t ... # Test test-mq-qrefresh.t 
# Running sh "/tmp/hgtests.qiewis6n/child407/test-mq-qrefresh.t.sh" 
# Ret was: 0 (test-rebase-cache.t) 
ok
test-narrow-widen.t#flat
test-narrow-widen.t#flat ... # Test test-narrow-widen.t#flat 
# Running sh "/tmp/hgtests.qiewis6n/child408/test-narrow-widen.t-flat.sh" 
# Timout reached for process 1141804 
# Ret was: 0 (test-merge-exec.t) 
ok
test-narrow-widen.t#tree
test-narrow-widen.t#tree ... # Test test-narrow-widen.t#tree 
# Timout reached for process 1143838 
# Running sh "/tmp/hgtests.qiewis6n/child409/test-narrow-widen.t-tree.sh" 
# Ret was: 0 (test-mq-qrefresh.t) 
ok
test-githelp.t
test-githelp.t ... # Test test-githelp.t 
# Running sh "/tmp/hgtests.qiewis6n/child410/test-githelp.t.sh" 
# Timout reached for process 1145578 
# Ret was: 0 (test-unamend.t) 
# Timout reached for process 1145462 
ok
test-share-bookmarks.t#svfs#normal
test-share-bookmarks.t#svfs#normal ... # Test test-share-bookmarks.t#svfs#normal 
# Running sh "/tmp/hgtests.qiewis6n/child411/test-share-bookmarks.t-svfs-normal.sh" 
# Ret was: 0 (test-narrow-widen.t#flat) 
ok
test-share-bookmarks.t#svfs#safe
test-share-bookmarks.t#svfs#safe ... # Test test-share-bookmarks.t#svfs#safe 
# Timout reached for process 1145610 
# Running sh "/tmp/hgtests.qiewis6n/child412/test-share-bookmarks.t-svfs-safe.sh" 
# Ret was: 0 (test-narrow-widen.t#tree) 
ok
test-share-bookmarks.t#vfs#normal
test-share-bookmarks.t#vfs#normal ... # Test test-share-bookmarks.t#vfs#normal 
# Running sh "/tmp/hgtests.qiewis6n/child413/test-share-bookmarks.t-vfs-normal.sh" 
# Timout reached for process 1145649 
# Ret was: 0 (test-share-bookmarks.t#svfs#normal) 
ok
test-share-bookmarks.t#vfs#safe
test-share-bookmarks.t#vfs#safe ... # Test test-share-bookmarks.t#vfs#safe 
# Timout reached for process 1146082 
# Timout reached for process 1146001 
# Ret was: 0 (test-githelp.t) 
ok
test-histedit-fold-non-commute.t
test-histedit-fold-non-commute.t ... # Test test-histedit-fold-non-commute.t 
# Running sh "/tmp/hgtests.qiewis6n/child415/test-histedit-fold-non-commute.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child414/test-share-bookmarks.t-vfs-safe.sh" 
# Ret was: 0 (test-share-bookmarks.t#svfs#safe) 
ok
test-remotefilelog-prefetch.t
test-remotefilelog-prefetch.t ... # Test test-remotefilelog-prefetch.t 
# Timout reached for process 1146285 
# Running sh "/tmp/hgtests.qiewis6n/child416/test-remotefilelog-prefetch.t.sh" 
# Timout reached for process 1146317 
# Ret was: 0 (test-share-bookmarks.t#vfs#normal) 
ok
test-gendoc-pt_BR.t
test-gendoc-pt_BR.t ... # Test test-gendoc-pt_BR.t 
# Running sh "/tmp/hgtests.qiewis6n/child417/test-gendoc-pt_BR.t.sh" 
# Ret was: 0 (test-gendoc-pt_BR.t) 
ok
# Timout reached for process 1146654 
test-gendoc-zh_CN.t
test-gendoc-zh_CN.t ... # Test test-gendoc-zh_CN.t 
# Running sh "/tmp/hgtests.qiewis6n/child418/test-gendoc-zh_CN.t.sh" 
# Ret was: 0 (test-share-bookmarks.t#vfs#safe) 
ok
test-gendoc-zh_TW.t
test-gendoc-zh_TW.t ... # Test test-gendoc-zh_TW.t 
# Timout reached for process 1146401 
# Running sh "/tmp/hgtests.qiewis6n/child419/test-gendoc-zh_TW.t.sh" 
# Ret was: 0 (test-gendoc-zh_CN.t) 
ok
test-histedit-non-commute.t
test-histedit-non-commute.t ... # Test test-histedit-non-commute.t 
# Running sh "/tmp/hgtests.qiewis6n/child420/test-histedit-non-commute.t.sh" 
# Timout reached for process 1146710 
# Ret was: 0 (test-histedit-fold-non-commute.t) 
ok
test-exchange-obsmarkers-case-A3.t
test-exchange-obsmarkers-case-A3.t ... # Test test-exchange-obsmarkers-case-A3.t 
# Running sh "/tmp/hgtests.qiewis6n/child421/test-exchange-obsmarkers-case-A3.t.sh" 
# Timout reached for process 1146393 
# Ret was: 0 (test-gendoc-zh_TW.t) 
ok
test-mq-qrefresh-interactive.t
test-mq-qrefresh-interactive.t ... # Test test-mq-qrefresh-interactive.t 
# Running sh "/tmp/hgtests.qiewis6n/child422/test-mq-qrefresh-interactive.t.sh" 
# Timout reached for process 1146758 
# Ret was: 0 (test-mq-qrefresh-interactive.t) 
ok
test-conflict.t
test-conflict.t ... # Test test-conflict.t 
# Running sh "/tmp/hgtests.qiewis6n/child423/test-conflict.t.sh" 
# Timout reached for process 1146822 
# Ret was: 0 (test-conflict.t) 
ok
test-diff-unified.t
test-diff-unified.t ... # Test test-diff-unified.t 
# Running sh "/tmp/hgtests.qiewis6n/child424/test-diff-unified.t.sh" 
# Timout reached for process 1146930 
# Ret was: 0 (test-histedit-non-commute.t) 
ok
test-flagprocessor.t
test-flagprocessor.t ... # Test test-flagprocessor.t 
# Timout reached for process 1146785 
# Running sh "/tmp/hgtests.qiewis6n/child425/test-flagprocessor.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-A3.t) 
ok
test-rebase-obsolete2.t
test-rebase-obsolete2.t ... # Test test-rebase-obsolete2.t 
# Running sh "/tmp/hgtests.qiewis6n/child426/test-rebase-obsolete2.t.sh" 
# Timout reached for process 1146808 

--- /<<PKGBUILDDIR>>/tests/test-diff-unified.t
+++ /<<PKGBUILDDIR>>/tests/test-diff-unified.t.err
@@ -407,6 +407,8 @@
   ...     f.write(b' 0 a with grave (composition)\n') and None
   ...     f.write(b' .\n' * 3) and None
   $ hg ci -qAm0
+  Bus error
+  [135]
 
   >>> with open('a', 'wb') as f:
   ...     f.write(b'a' * 39 + b'bb' + b'\n') and None
@@ -422,38 +424,12 @@
   ...     f.write(b' 1 a with grave (composition)\n') and None
   ...     f.write(b' .\n' * 3) and None
   $ hg ci -m1
+  nothing changed
+  [1]
 
   $ hg diff -c1 --nodates --show-function
-  diff -r 3e92dd6fa812 -r a256341606cb a
-  --- a/a
-  +++ b/a
-  @@ -2,7 +2,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
-    .
-    .
-    .
-  - 0 b
-  + 1 b
-    .
-    .
-    .
-  @@ -10,7 +10,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xc3\xa0 (esc)
-    .
-    .
-    .
-  - 0 a with grave (single code point)
-  + 1 a with grave (single code point)
-    .
-    .
-    .
-  @@ -18,7 +18,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xcc\x80 (esc)
-    .
-    .
-    .
-  - 0 a with grave (composition)
-  + 1 a with grave (composition)
-    .
-    .
-    .
+  abort: unknown revision '1'
+  [10]
 
   $ cd ..
 

ERROR: test-diff-unified.t output changed
!# Ret was: 0 (test-diff-unified.t) 
test-mq-qnew.t
test-mq-qnew.t ... # Test test-mq-qnew.t 
# Running sh "/tmp/hgtests.qiewis6n/child427/test-mq-qnew.t.sh" 
# Timout reached for process 1147255 
# Timout reached for process 1146611 
# Ret was: 0 (test-remotefilelog-prefetch.t) 
ok
test-win32text.t
test-win32text.t ... # Test test-win32text.t 
# Running sh "/tmp/hgtests.qiewis6n/child428/test-win32text.t.sh" 
# Timout reached for process 1147287 
# Ret was: 0 (test-flagprocessor.t) 
ok
test-exchange-obsmarkers-case-C3.t
test-exchange-obsmarkers-case-C3.t ... # Test test-exchange-obsmarkers-case-C3.t 
# Running sh "/tmp/hgtests.qiewis6n/child429/test-exchange-obsmarkers-case-C3.t.sh" 
# Ret was: 0 (test-win32text.t) 
ok
test-gendoc-da.t
test-gendoc-da.t ... # Test test-gendoc-da.t 
# Timout reached for process 1147592 
# Running sh "/tmp/hgtests.qiewis6n/child430/test-gendoc-da.t.sh" 
# Ret was: 0 (test-rebase-obsolete2.t) 
ok
# Timout reached for process 1147388 
test-gendoc-el.t
test-gendoc-el.t ... # Test test-gendoc-el.t 
# Running sh "/tmp/hgtests.qiewis6n/child431/test-gendoc-el.t.sh" 
# Ret was: 0 (test-gendoc-da.t) 
ok
test-gendoc-fr.t
test-gendoc-fr.t ... # Test test-gendoc-fr.t 
# Timout reached for process 1147844 
# Running sh "/tmp/hgtests.qiewis6n/child432/test-gendoc-fr.t.sh" 
# Ret was: 0 (test-gendoc-el.t) 
ok
test-gendoc-it.t
test-gendoc-it.t ... # Test test-gendoc-it.t 
# Timout reached for process 1147869 
# Running sh "/tmp/hgtests.qiewis6n/child433/test-gendoc-it.t.sh" 
# Ret was: 0 (test-gendoc-fr.t) 
ok
test-gendoc-ru.t
test-gendoc-ru.t ... # Test test-gendoc-ru.t 
# Timout reached for process 1147896 
# Running sh "/tmp/hgtests.qiewis6n/child434/test-gendoc-ru.t.sh" 
# Ret was: 0 (test-gendoc-it.t) 
ok
test-gendoc-sv.t
test-gendoc-sv.t ... # Test test-gendoc-sv.t 
# Timout reached for process 1147920 
# Running sh "/tmp/hgtests.qiewis6n/child435/test-gendoc-sv.t.sh" 
# Ret was: 0 (test-gendoc-ru.t) 
ok
test-hgrc.t
test-hgrc.t ... # Test test-hgrc.t 
# Timout reached for process 1147946 
# Running sh "/tmp/hgtests.qiewis6n/child436/test-hgrc.t.sh" 
# Ret was: 0 (test-gendoc-sv.t) 
ok
# Timout reached for process 1147970 
test-split-legacy-inline-changelog.t
test-split-legacy-inline-changelog.t ... # Test test-split-legacy-inline-changelog.t 
# Running sh "/tmp/hgtests.qiewis6n/child437/test-split-legacy-inline-changelog.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-C3.t) 
ok
test-bheads.t
test-bheads.t ... # Test test-bheads.t 
# Running sh "/tmp/hgtests.qiewis6n/child438/test-bheads.t.sh" 
# Timout reached for process 1147756 
# Ret was: 0 (test-mq-qnew.t) 
ok
test-diff-ignore-whitespace.t
test-diff-ignore-whitespace.t ... # Test test-diff-ignore-whitespace.t 
# Running sh "/tmp/hgtests.qiewis6n/child439/test-diff-ignore-whitespace.t.sh" 
# Timout reached for process 1147549 
# Ret was: 0 (test-hgrc.t) 
ok
test-init.t
test-init.t ... # Test test-init.t 
# Timout reached for process 1148005 
# Running sh "/tmp/hgtests.qiewis6n/child440/test-init.t.sh" 
# Ret was: 0 (test-split-legacy-inline-changelog.t) 
ok
test-rename-dir-merge.t
test-rename-dir-merge.t ... # Test test-rename-dir-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child441/test-rename-dir-merge.t.sh" 
# Timout reached for process 1148023 
# Ret was: 0 (test-diff-ignore-whitespace.t) 
ok
test-bookflow.t
test-bookflow.t ... # Test test-bookflow.t 
# Running sh "/tmp/hgtests.qiewis6n/child442/test-bookflow.t.sh" 
# Timout reached for process 1148130 
# Timout reached for process 1148059 
# Ret was: 0 (test-bheads.t) 
ok
test-largefiles-cache.t
test-largefiles-cache.t ... # Test test-largefiles-cache.t 
# Running sh "/tmp/hgtests.qiewis6n/child443/test-largefiles-cache.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-rename-dir-merge.t
+++ /<<PKGBUILDDIR>>/tests/test-rename-dir-merge.t.err
@@ -322,17 +322,23 @@
   moving dir2/subdir1/file3 to dir2/subdir2/file3
   moving dir2/subdir1/file4 to dir2/subdir2/file4
   $ hg ci -m 'move dir1/ to dir2/ and dir1/subdir1/ to dir2/subdir2/'
+  Bus error
+  [135]
   $ hg co 0
-  4 files updated, 0 files merged, 4 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo e > dir1/subdir1/file5
+  $TESTTMP.sh: 208: cannot create dir1/subdir1/file5: Directory nonexistent
+  [2]
   $ hg ci -Aqm 'add file in dir1/subdir1/'
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg merge 1
-  5 files updated, 0 files merged, 4 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  abort: unknown revision '1'
+  [10]
   $ hg files
   dir2/file1
   dir2/file2
   dir2/subdir2/file3
   dir2/subdir2/file4
-  dir2/subdir2/file5
-  $ cd ..
+  $ cd ..

ERROR: test-rename-dir-merge.t output changed
!# Ret was: 0 (test-rename-dir-merge.t) 
test-encoding.t
test-encoding.t ... # Test test-encoding.t 
# Timout reached for process 1148336 
# Running sh "/tmp/hgtests.qiewis6n/child444/test-encoding.t.sh" 
# Ret was: 0 (test-encoding.t) 
ok
test-mq-qrefresh-replace-log-message.t
test-mq-qrefresh-replace-log-message.t ... # Test test-mq-qrefresh-replace-log-message.t 
# Running sh "/tmp/hgtests.qiewis6n/child445/test-mq-qrefresh-replace-log-message.t.sh" 
# Timout reached for process 1148723 
# Killing daemon process 1148835 
# Timout reached for process 1148686 
# Daemon process 1148835 is stuck - really killing it 
# Killing daemon process 1148970 
# Daemon process 1148970 is stuck - really killing it 
# Killing daemon process 1148995 
# Daemon process 1148995 is stuck - really killing it 
# Ret was: 0 (test-largefiles-cache.t) 
ok
test-convert-bzr-merges.t
test-convert-bzr-merges.t ... # Test test-convert-bzr-merges.t 
# Running sh "/tmp/hgtests.qiewis6n/child446/test-convert-bzr-merges.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr-merges.t) 
test-url-rev.t
test-url-rev.t ... # Test test-url-rev.t 
# Running sh "/tmp/hgtests.qiewis6n/child447/test-url-rev.t.sh" 
# Timout reached for process 1149058 
# Ret was: 0 (test-bookflow.t) 
ok
test-mq-qimport.t
test-mq-qimport.t ... # Test test-mq-qimport.t 
# Running sh "/tmp/hgtests.qiewis6n/child448/test-mq-qimport.t.sh" 
# Timout reached for process 1148440 
# Ret was: 0 (test-mq-qrefresh-replace-log-message.t) 
ok
test-bundle-r.t
test-bundle-r.t ... # Test test-bundle-r.t 
# Running sh "/tmp/hgtests.qiewis6n/child449/test-bundle-r.t.sh" 
# Timout reached for process 1148896 
# Timout reached for process 1148270 
# Ret was: 0 (test-init.t) 
ok
test-diff-change.t
test-diff-change.t ... # Test test-diff-change.t 
# Running sh "/tmp/hgtests.qiewis6n/child450/test-diff-change.t.sh" 
# Ret was: 0 (test-url-rev.t) 
ok
test-pager-legacy.t
test-pager-legacy.t ... # Test test-pager-legacy.t 
# Timout reached for process 1149062 
# Running sh "/tmp/hgtests.qiewis6n/child451/test-pager-legacy.t.sh" 
# Ret was: 0 (test-mq-qimport.t) 
ok
test-histedit-base.t
test-histedit-base.t ... # Test test-histedit-base.t 
# Timout reached for process 1149100 
# Running sh "/tmp/hgtests.qiewis6n/child452/test-histedit-base.t.sh" 
# Ret was: 0 (test-pager-legacy.t) 
ok
test-share.t#normal
test-share.t#normal ... # Test test-share.t#normal 
# Timout reached for process 1149408 
# Running sh "/tmp/hgtests.qiewis6n/child453/test-share.t-normal.sh" 
# Ret was: 0 (test-diff-change.t) 
ok
test-share.t#safe
test-share.t#safe ... # Test test-share.t#safe 
# Timout reached for process 1149320 
# Running sh "/tmp/hgtests.qiewis6n/child454/test-share.t-safe.sh" 
# Ret was: 0 (test-histedit-base.t) 
ok
test-status-rev.t
test-status-rev.t ... # Test test-status-rev.t 
# Running sh "/tmp/hgtests.qiewis6n/child455/test-status-rev.t.sh" 
# Timout reached for process 1149549 
# Timout reached for process 1149276 
# Ret was: 0 (test-bundle-r.t) 
ok
test-hgweb-raw.t
test-hgweb-raw.t ... # Test test-hgweb-raw.t 
# Running sh "/tmp/hgtests.qiewis6n/child456/test-hgweb-raw.t.sh" 
# Ret was: 0 (test-hgweb-raw.t) 
ok
test-rebase-base-flag.t
test-rebase-base-flag.t ... # Test test-rebase-base-flag.t 
# Running sh "/tmp/hgtests.qiewis6n/child457/test-rebase-base-flag.t.sh" 
# Timout reached for process 1149862 

--- /<<PKGBUILDDIR>>/tests/test-status-rev.t
+++ /<<PKGBUILDDIR>>/tests/test-status-rev.t.err
@@ -29,6 +29,8 @@
   adding content1_missing_missing-tracked
   adding content1_missing_missing-untracked
   $ hg commit -m first
+  Bus error
+  [135]
 
 Second commit
 
@@ -47,6 +49,9 @@
   adding missing_content2_missing-tracked
   adding missing_content2_missing-untracked
   $ hg commit -m second
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Working copy
 
@@ -68,115 +73,78 @@
 Status compared to parent of the working copy, i.e. the dirstate status
 
   $ hg status -A --rev 1 'glob:missing_content2_content3-tracked'
-  M missing_content2_content3-tracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 1 'glob:missing_content2_content2-tracked'
-  C missing_content2_content2-tracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 1 'glob:missing_missing_content3-tracked'
-  A missing_missing_content3-tracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 1 'glob:missing_missing_content3-untracked'
-  ? missing_missing_content3-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 1 'glob:missing_content2_*-untracked'
-  R missing_content2_content2-untracked
-  R missing_content2_content3-untracked
-  R missing_content2_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 1 'glob:missing_*_missing-tracked'
-  ! missing_content2_missing-tracked
-  ! missing_missing_missing-tracked
+  abort: unknown revision '1'
+  [10]
 
   $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
-  missing_missing_missing-untracked: $ENOENT$
+  abort: unknown revision '1'
+  [10]
 
 Status between first and second commit. Should ignore dirstate status.
 
   $ hg status -marc --rev 0 --rev 1 --config rhg.on-unsupported=abort
-  M content1_content2_content1-tracked
-  M content1_content2_content1-untracked
-  M content1_content2_content2-tracked
-  M content1_content2_content2-untracked
-  M content1_content2_content3-tracked
-  M content1_content2_content3-untracked
-  M content1_content2_missing-tracked
-  M content1_content2_missing-untracked
-  A missing_content2_content2-tracked
-  A missing_content2_content2-untracked
-  A missing_content2_content3-tracked
-  A missing_content2_content3-untracked
-  A missing_content2_missing-tracked
-  A missing_content2_missing-untracked
-  R content1_missing_content1-tracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-tracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-tracked
-  R content1_missing_missing-untracked
-  C content1_content1_content1-tracked
-  C content1_content1_content1-untracked
-  C content1_content1_content3-tracked
-  C content1_content1_content3-untracked
-  C content1_content1_missing-tracked
-  C content1_content1_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 0:1 'glob:content1_content2_*'
-  M content1_content2_content1-tracked
-  M content1_content2_content1-untracked
-  M content1_content2_content2-tracked
-  M content1_content2_content2-untracked
-  M content1_content2_content3-tracked
-  M content1_content2_content3-untracked
-  M content1_content2_missing-tracked
-  M content1_content2_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 0:1 'glob:content1_content1_*'
-  C content1_content1_content1-tracked
-  C content1_content1_content1-untracked
-  C content1_content1_content3-tracked
-  C content1_content1_content3-untracked
-  C content1_content1_missing-tracked
-  C content1_content1_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 0:1 'glob:missing_content2_*'
-  A missing_content2_content2-tracked
-  A missing_content2_content2-untracked
-  A missing_content2_content3-tracked
-  A missing_content2_content3-untracked
-  A missing_content2_missing-tracked
-  A missing_content2_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 0:1 'glob:content1_missing_*'
-  R content1_missing_content1-tracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-tracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-tracked
-  R content1_missing_missing-untracked
+  abort: unknown revision '1'
+  [10]
   $ hg status -A --rev 0:1 'glob:missing_missing_*'
+  abort: unknown revision '1'
+  [10]
 
 Status compared to one revision back, checking that the dirstate status
 is correctly combined with the inter-revision status
 
   $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked'
-  M content1_content1_content3-tracked
-  M content1_content2_content2-tracked
-  M content1_content2_content3-tracked
-  M content1_missing_content3-tracked
+  A content1_content1_content3-tracked
+  A content1_content2_content2-tracked
+  A content1_content2_content3-tracked
+  A content1_missing_content3-tracked
   $ hg status -A --rev 0 'glob:content1_*_content1-tracked'
-  C content1_content1_content1-tracked
-  C content1_content2_content1-tracked
-  C content1_missing_content1-tracked
+  A content1_content1_content1-tracked
+  A content1_content2_content1-tracked
+  A content1_missing_content1-tracked
   $ hg status -A --rev 0 'glob:missing_*_content?-tracked'
   A missing_content2_content2-tracked
   A missing_content2_content3-tracked
   A missing_missing_content3-tracked
 BROKEN: missing_content2_content[23]-untracked exist, so should be listed
   $ hg status -A --rev 0 'glob:missing_*_content?-untracked'
+  ? missing_content2_content2-untracked
+  ? missing_content2_content3-untracked
   ? missing_missing_content3-untracked
   $ hg status -A --rev 0 'glob:content1_*_*-untracked'
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R content1_missing_content1-untracked
-  R content1_missing_content3-untracked
-  R content1_missing_missing-untracked
+  ? content1_content1_content1-untracked
+  ? content1_content1_content3-untracked
+  ? content1_content2_content1-untracked
+  ? content1_content2_content2-untracked
+  ? content1_content2_content3-untracked
+  ? content1_missing_content1-untracked
+  ? content1_missing_content3-untracked
   $ hg status -A --rev 0 'glob:*_*_missing-tracked'
   ! content1_content1_missing-tracked
   ! content1_content2_missing-tracked

ERROR: test-status-rev.t output changed
!# Ret was: 0 (test-status-rev.t) 
test-removeemptydirs.t
test-removeemptydirs.t ... # Test test-removeemptydirs.t 
# Timout reached for process 1149800 
# Running sh "/tmp/hgtests.qiewis6n/child458/test-removeemptydirs.t.sh" 
# Timout reached for process 1149645 
# Ret was: 0 (test-share.t#normal) 
ok
test-rebase-mq.t
test-rebase-mq.t ... # Test test-rebase-mq.t 
# Running sh "/tmp/hgtests.qiewis6n/child459/test-rebase-mq.t.sh" 
# Timout reached for process 1149674 
# Ret was: 0 (test-share.t#safe) 
ok
test-parseindex.t
test-parseindex.t ... # Test test-parseindex.t 
# Running sh "/tmp/hgtests.qiewis6n/child460/test-parseindex.t.sh" 
# Ret was: 0 (test-parseindex.t) 
ok
test-exchange-obsmarkers-case-D1.t
test-exchange-obsmarkers-case-D1.t ... # Test test-exchange-obsmarkers-case-D1.t 
# Running sh "/tmp/hgtests.qiewis6n/child461/test-exchange-obsmarkers-case-D1.t.sh" 
# Timout reached for process 1150080 
# Timout reached for process 1149995 
# Ret was: 0 (test-removeemptydirs.t) 
ok
test-hgweb-removed.t
test-hgweb-removed.t ... # Test test-hgweb-removed.t 
# Running sh "/tmp/hgtests.qiewis6n/child462/test-hgweb-removed.t.sh" 
# Ret was: 0 (test-rebase-base-flag.t) 
ok
test-eol-patch.t
test-eol-patch.t ... # Test test-eol-patch.t 
# Running sh "/tmp/hgtests.qiewis6n/child463/test-eol-patch.t.sh" 
# Timout reached for process 1149967 
# Killing daemon process 1150346 
# Timout reached for process 1150315 
# Daemon process 1150346 is stuck - really killing it 
# Ret was: 0 (test-hgweb-removed.t) 
ok
test-automv.t
test-automv.t ... # Test test-automv.t 
# Running sh "/tmp/hgtests.qiewis6n/child464/test-automv.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-D1.t) 
ok
test-exchange-obsmarkers-case-C2.t
test-exchange-obsmarkers-case-C2.t ... # Timout reached for process 1150166 
# Test test-exchange-obsmarkers-case-C2.t 
# Running sh "/tmp/hgtests.qiewis6n/child465/test-exchange-obsmarkers-case-C2.t.sh" 
# Ret was: 0 (test-rebase-mq.t) 
ok
test-narrow-clone.t
test-narrow-clone.t ... # Test test-narrow-clone.t 
# Running sh "/tmp/hgtests.qiewis6n/child466/test-narrow-clone.t.sh" 
# Timout reached for process 1150033 
# Ret was: 0 (test-eol-patch.t) 
ok
test-casecollision-merge.t
test-casecollision-merge.t ... # Test test-casecollision-merge.t 
# Timout reached for process 1150339 
# Running sh "/tmp/hgtests.qiewis6n/child467/test-casecollision-merge.t.sh" 
skipped missing feature: case insensitive file system
# Ret was: 80 (test-casecollision-merge.t) 
test-pull-bundle.t
test-pull-bundle.t ... # Test test-pull-bundle.t 
# Timout reached for process 1150549 
# Running sh "/tmp/hgtests.qiewis6n/child468/test-pull-bundle.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-C2.t) 
ok
test-subrepo-relative-path.t
test-subrepo-relative-path.t ... # Test test-subrepo-relative-path.t 
# Running sh "/tmp/hgtests.qiewis6n/child469/test-subrepo-relative-path.t.sh" 
# Timout reached for process 1150462 
# Timout reached for process 1150558 
# Ret was: 0 (test-pull-bundle.t) 
ok
test-bundle-phase-internal.t
test-bundle-phase-internal.t ... # Test test-bundle-phase-internal.t 
# Running sh "/tmp/hgtests.qiewis6n/child470/test-bundle-phase-internal.t.sh" 
# Timout reached for process 1150821 
# Ret was: 0 (test-subrepo-relative-path.t) 
ok
test-histedit-no-change.t
test-histedit-no-change.t ... # Test test-histedit-no-change.t 
# Running sh "/tmp/hgtests.qiewis6n/child471/test-histedit-no-change.t.sh" 
# Timout reached for process 1150837 
# Ret was: 0 (test-bundle-phase-internal.t) 
ok
test-convert-bzr.t
test-convert-bzr.t ... # Test test-convert-bzr.t 
# Running sh "/tmp/hgtests.qiewis6n/child472/test-convert-bzr.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr.t) 
test-pull-update.t
test-pull-update.t ... # Test test-pull-update.t 
# Running sh "/tmp/hgtests.qiewis6n/child473/test-pull-update.t.sh" 
# Timout reached for process 1151061 
# Ret was: 0 (test-automv.t) 
ok
test-template-graph.t
test-template-graph.t ... # Test test-template-graph.t 
# Running sh "/tmp/hgtests.qiewis6n/child474/test-template-graph.t.sh" 
# Timout reached for process 1150366 
# Timout reached for process 1150485 

--- /<<PKGBUILDDIR>>/tests/test-narrow-clone.t
+++ /<<PKGBUILDDIR>>/tests/test-narrow-clone.t.err
@@ -31,24 +31,16 @@
 rootfilesin: patterns work
 
   $ hg clone --narrow ssh://user@dummy/master rootfilesin --noupdate --include 'rootfilesin:dir'
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 0 changes to 0 files
-  new changesets 26ce255d5b5d
+  Bus error
+  [135]
   $ hg tracked -R rootfilesin
   I rootfilesin:dir
 
 narrow clone a file, f10
 
   $ hg clone --narrow ssh://user@dummy/master narrow --noupdate --include "dir/src/f10"
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 3 changesets with 1 changes to 1 files
-  new changesets *:* (glob)
+  Bus error
+  [135]
   $ cd narrow
   $ hg debugrequires | grep -v generaldelta
   dotencode
@@ -68,25 +60,20 @@
   $ hg tracked
   I path:dir/src/f10
   $ hg update
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ find * | sort
-  dir
-  dir/src
-  dir/src/f10
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ find * | sort
+  find: '*': $ENOENT$
   $ cat dir/src/f10
-  10
+  cat: dir/src/f10: $ENOENT$
+  [1]
 
   $ cd ..
 
 local-to-local narrow clones work
 
   $ hg clone --narrow master narrow-via-localpeer --noupdate --include "dir/src/f10"
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 3 changesets with 1 changes to 1 files
-  new changesets 5d21aaea77f8:26ce255d5b5d
+  Bus error
+  [135]
   $ hg tracked -R narrow-via-localpeer
   I path:dir/src/f10
   $ rm -Rf narrow-via-localpeer

ERROR: test-narrow-clone.t output changed
!# Ret was: 0 (test-narrow-clone.t) 
test-http-proxy.t
test-http-proxy.t ... # Test test-http-proxy.t 
# Running sh "/tmp/hgtests.qiewis6n/child475/test-http-proxy.t.sh" 
# Ret was: 0 (test-histedit-no-change.t) 
ok
test-bad-extension.t
test-bad-extension.t ... # Test test-bad-extension.t 
# Timout reached for process 1151039 
# Running sh "/tmp/hgtests.qiewis6n/child476/test-bad-extension.t.sh" 
# Timout reached for process 1151390 
# Ret was: 0 (test-bad-extension.t) 
ok
test-add.t
test-add.t ... # Test test-add.t 
# Running sh "/tmp/hgtests.qiewis6n/child477/test-add.t.sh" 
# Timout reached for process 1151065 
# Ret was: 0 (test-pull-update.t) 
ok
test-chainsaw-update.t
test-chainsaw-update.t ... # Test test-chainsaw-update.t 
# Running sh "/tmp/hgtests.qiewis6n/child478/test-chainsaw-update.t.sh" 
# Timout reached for process 1151371 
# Killing daemon process 1151396 
# Killing daemon process 1151407 
# Ret was: 0 (test-http-proxy.t) 
ok
test-purge.t#dirstate-v1
test-purge.t#dirstate-v1 ... # Test test-purge.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child479/test-purge.t-dirstate-v1.sh" 
# Ret was: 0 (test-template-graph.t) 
ok
test-purge.t#dirstate-v2
test-purge.t#dirstate-v2 ... # Test test-purge.t#dirstate-v2 
# Timout reached for process 1151181 
# Running sh "/tmp/hgtests.qiewis6n/child480/test-purge.t-dirstate-v2.sh" 
# Ret was: 0 (test-chainsaw-update.t) 
ok
test-diffstat.t
test-diffstat.t ... # Test test-diffstat.t 
# Running sh "/tmp/hgtests.qiewis6n/child481/test-diffstat.t.sh" 
# Timout reached for process 1151535 
# Ret was: 0 (test-purge.t#dirstate-v1) 
ok
test-bookmarks-corner-case.t
test-bookmarks-corner-case.t ... # Test test-bookmarks-corner-case.t 
# Running sh "/tmp/hgtests.qiewis6n/child482/test-bookmarks-corner-case.t.sh" 
# Timout reached for process 1151569 
# Ret was: 0 (test-add.t) 
ok
test-convert-splicemap.t
test-convert-splicemap.t ... # Test test-convert-splicemap.t 
# Running sh "/tmp/hgtests.qiewis6n/child483/test-convert-splicemap.t.sh" 
# Timout reached for process 1151495 
# Ret was: 0 (test-purge.t#dirstate-v2) 
ok
test-fileset-generated.t
test-fileset-generated.t ... # Test test-fileset-generated.t 
# Running sh "/tmp/hgtests.qiewis6n/child484/test-fileset-generated.t.sh" 
# Timout reached for process 1151650 
# Ret was: 0 (test-diffstat.t) 
ok
test-transaction-safety.t#changelogv2
test-transaction-safety.t#changelogv2 ... # Test test-transaction-safety.t#changelogv2 
# Timout reached for process 1151730 
# Running sh "/tmp/hgtests.qiewis6n/child485/test-transaction-safety.t-changelogv2.sh" 
# Ret was: 0 (test-bookmarks-corner-case.t) 
ok
test-transaction-safety.t#revlogv1
test-transaction-safety.t#revlogv1 ... # Test test-transaction-safety.t#revlogv1 
# Timout reached for process 1152147 
# Running sh "/tmp/hgtests.qiewis6n/child486/test-transaction-safety.t-revlogv1.sh" 
# Timout reached for process 1152252 

--- /<<PKGBUILDDIR>>/tests/test-fileset-generated.t
+++ /<<PKGBUILDDIR>>/tests/test-fileset-generated.t.err
@@ -6,10 +6,15 @@
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1
   $ hg addremove -q --similarity 0
   $ hg commit -m first
+  Bus error
+  [135]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2
   $ hg addremove -q --similarity 0
   $ hg commit -m second
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc
   $ hg addremove -q --similarity 0
@@ -19,27 +24,20 @@
 Test status
 
   $ hg st -A 'set:modified()'
-  M content1_content1_content3-tracked
-  M content1_content2_content1-tracked
-  M content1_content2_content3-tracked
-  M missing_content2_content3-tracked
 
   $ hg st -A 'set:added()'
+  A content1_content1_content1-tracked
+  A content1_content1_content3-tracked
+  A content1_content2_content1-tracked
+  A content1_content2_content2-tracked
+  A content1_content2_content3-tracked
   A content1_missing_content1-tracked
   A content1_missing_content3-tracked
+  A missing_content2_content2-tracked
+  A missing_content2_content3-tracked
   A missing_missing_content3-tracked
 
   $ hg st -A 'set:removed()'
-  R content1_content1_content1-untracked
-  R content1_content1_content3-untracked
-  R content1_content1_missing-untracked
-  R content1_content2_content1-untracked
-  R content1_content2_content2-untracked
-  R content1_content2_content3-untracked
-  R content1_content2_missing-untracked
-  R missing_content2_content2-untracked
-  R missing_content2_content3-untracked
-  R missing_content2_missing-untracked
 
   $ hg st -A 'set:deleted()'
   ! content1_content1_missing-tracked
@@ -56,143 +54,54 @@
   ! missing_missing_missing-tracked
 
   $ hg st -A 'set:unknown()'
+  ? content1_content1_content1-untracked
+  ? content1_content1_content3-untracked
+  ? content1_content2_content1-untracked
+  ? content1_content2_content2-untracked
+  ? content1_content2_content3-untracked
   ? content1_missing_content1-untracked
   ? content1_missing_content3-untracked
+  ? missing_content2_content2-untracked
+  ? missing_content2_content3-untracked
   ? missing_missing_content3-untracked
 
   $ hg st -A 'set:clean()'
-  C content1_content1_content1-tracked
-  C content1_content2_content2-tracked
-  C missing_content2_content2-tracked
 
 Test log
 
   $ hg log -T '{rev}\n' --stat 'set:modified()'
-  1
-   content1_content2_content1-tracked |  2 +-
-   content1_content2_content3-tracked |  2 +-
-   missing_content2_content3-tracked  |  1 +
-   3 files changed, 3 insertions(+), 2 deletions(-)
-  
-  0
-   content1_content1_content3-tracked |  1 +
-   content1_content2_content1-tracked |  1 +
-   content1_content2_content3-tracked |  1 +
-   3 files changed, 3 insertions(+), 0 deletions(-)
-  
 Largefiles doesn't crash
   $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
-  1
-   content1_content2_content1-tracked |  2 +-
-   content1_content2_content3-tracked |  2 +-
-   missing_content2_content3-tracked  |  1 +
-   3 files changed, 3 insertions(+), 2 deletions(-)
-  
-  0
-   content1_content1_content3-tracked |  1 +
-   content1_content2_content1-tracked |  1 +
-   content1_content2_content3-tracked |  1 +
-   3 files changed, 3 insertions(+), 0 deletions(-)
-  
   $ hg log -T '{rev}\n' --stat 'set:added()'
-  1
-   content1_missing_content1-tracked |  1 -
-   content1_missing_content3-tracked |  1 -
-   2 files changed, 0 insertions(+), 2 deletions(-)
-  
-  0
-   content1_missing_content1-tracked |  1 +
-   content1_missing_content3-tracked |  1 +
-   2 files changed, 2 insertions(+), 0 deletions(-)
-  
   $ hg log -T '{rev}\n' --stat 'set:removed()'
-  1
-   content1_content2_content1-untracked |  2 +-
-   content1_content2_content2-untracked |  2 +-
-   content1_content2_content3-untracked |  2 +-
-   content1_content2_missing-untracked  |  2 +-
-   missing_content2_content2-untracked  |  1 +
-   missing_content2_content3-untracked  |  1 +
-   missing_content2_missing-untracked   |  1 +
-   7 files changed, 7 insertions(+), 4 deletions(-)
-  
-  0
-   content1_content1_content1-untracked |  1 +
-   content1_content1_content3-untracked |  1 +
-   content1_content1_missing-untracked  |  1 +
-   content1_content2_content1-untracked |  1 +
-   content1_content2_content2-untracked |  1 +
-   content1_content2_content3-untracked |  1 +
-   content1_content2_missing-untracked  |  1 +
-   7 files changed, 7 insertions(+), 0 deletions(-)
-  
   $ hg log -T '{rev}\n' --stat 'set:deleted()'
-  1
-   content1_content2_missing-tracked |  2 +-
-   content1_missing_missing-tracked  |  1 -
-   missing_content2_missing-tracked  |  1 +
-   3 files changed, 2 insertions(+), 2 deletions(-)
-  
-  0
-   content1_content1_missing-tracked |  1 +
-   content1_content2_missing-tracked |  1 +
-   content1_missing_missing-tracked  |  1 +
-   3 files changed, 3 insertions(+), 0 deletions(-)
-  
   $ hg log -T '{rev}\n' --stat 'set:unknown()'
-  1
-   content1_missing_content1-untracked |  1 -
-   content1_missing_content3-untracked |  1 -
-   2 files changed, 0 insertions(+), 2 deletions(-)
-  
-  0
-   content1_missing_content1-untracked |  1 +
-   content1_missing_content3-untracked |  1 +
-   2 files changed, 2 insertions(+), 0 deletions(-)
-  
   $ hg log -T '{rev}\n' --stat 'set:clean()'
-  1
-   content1_content2_content2-tracked |  2 +-
-   missing_content2_content2-tracked  |  1 +
-   2 files changed, 2 insertions(+), 1 deletions(-)
-  
-  0
-   content1_content1_content1-tracked |  1 +
-   content1_content2_content2-tracked |  1 +
-   2 files changed, 2 insertions(+), 0 deletions(-)
-  
 Test revert
 
   $ hg revert 'set:modified()'
-  reverting content1_content1_content3-tracked
-  reverting content1_content2_content1-tracked
-  reverting content1_content2_content3-tracked
-  reverting missing_content2_content3-tracked
 
   $ hg revert 'set:added()'
+  forgetting content1_content1_content1-tracked
+  forgetting content1_content1_content3-tracked
+  forgetting content1_content2_content1-tracked
+  forgetting content1_content2_content2-tracked
+  forgetting content1_content2_content3-tracked
   forgetting content1_missing_content1-tracked
   forgetting content1_missing_content3-tracked
+  forgetting missing_content2_content2-tracked
+  forgetting missing_content2_content3-tracked
   forgetting missing_missing_content3-tracked
 
   $ hg revert 'set:removed()'
-  undeleting content1_content1_content1-untracked
-  undeleting content1_content1_content3-untracked
-  undeleting content1_content1_missing-untracked
-  undeleting content1_content2_content1-untracked
-  undeleting content1_content2_content2-untracked
-  undeleting content1_content2_content3-untracked
-  undeleting content1_content2_missing-untracked
-  undeleting missing_content2_content2-untracked
-  undeleting missing_content2_content3-untracked
-  undeleting missing_content2_missing-untracked
 
   $ hg revert 'set:deleted()'
+  forgetting content1_content1_missing-tracked
+  forgetting content1_content2_missing-tracked
   forgetting content1_missing_missing-tracked
+  forgetting missing_content2_missing-tracked
   forgetting missing_missing_missing-tracked
-  reverting content1_content1_missing-tracked
-  reverting content1_content2_missing-tracked
-  reverting missing_content2_missing-tracked
 
   $ hg revert 'set:unknown()'
 

ERROR: test-fileset-generated.t output changed
!# Ret was: 0 (test-fileset-generated.t) 
test-transaction-safety.t#revlogv2
test-transaction-safety.t#revlogv2 ... # Test test-transaction-safety.t#revlogv2 
# Running sh "/tmp/hgtests.qiewis6n/child487/test-transaction-safety.t-revlogv2.sh" 
# Ret was: 0 (test-transaction-safety.t#changelogv2) 
ok
test-exchange-obsmarkers-case-C1.t
test-exchange-obsmarkers-case-C1.t ... # Test test-exchange-obsmarkers-case-C1.t 
# Running sh "/tmp/hgtests.qiewis6n/child488/test-exchange-obsmarkers-case-C1.t.sh" 
# Timout reached for process 1152295 
# Timout reached for process 1152239 
# Ret was: 0 (test-convert-splicemap.t) 
ok
test-diff-upgrade.t
test-diff-upgrade.t ... # Test test-diff-upgrade.t 
# Running sh "/tmp/hgtests.qiewis6n/child489/test-diff-upgrade.t.sh" 
# Ret was: 0 (test-transaction-safety.t#revlogv1) 
ok
test-churn.t
test-churn.t ... # Test test-churn.t 
# Running sh "/tmp/hgtests.qiewis6n/child490/test-churn.t.sh" 
# Timout reached for process 1152400 
# Ret was: 0 (test-diff-upgrade.t) 
ok
test-bisect3.t
test-bisect3.t ... # Test test-bisect3.t 
# Running sh "/tmp/hgtests.qiewis6n/child491/test-bisect3.t.sh" 
# Timout reached for process 1153010 
# Ret was: 0 (test-transaction-safety.t#revlogv2) 
ok
test-dispatch.t
test-dispatch.t ... # Test test-dispatch.t 
# Timout reached for process 1152575 
# Running sh "/tmp/hgtests.qiewis6n/child492/test-dispatch.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-C1.t) 
ok
test-repo-compengines.t
test-repo-compengines.t ... # Test test-repo-compengines.t 
# Timout reached for process 1152922 
# Running sh "/tmp/hgtests.qiewis6n/child493/test-repo-compengines.t.sh" 
# Ret was: 0 (test-bisect3.t) 
ok
test-clone-stream-revlog-split.t#stream-bundle2-v2
test-clone-stream-revlog-split.t#stream-bundle2-v2 ... # Test test-clone-stream-revlog-split.t#stream-bundle2-v2 
# Running sh "/tmp/hgtests.qiewis6n/child494/test-clone-stream-revlog-split.t-stream-bundle2-v2.sh" 
# Timout reached for process 1153406 
# Timout reached for process 1153446 
# Ret was: 0 (test-churn.t) 
ok
test-clone-stream-revlog-split.t#stream-bundle2-v3
test-clone-stream-revlog-split.t#stream-bundle2-v3 ... # Test test-clone-stream-revlog-split.t#stream-bundle2-v3 
# Timout reached for process 1153361 
# Running sh "/tmp/hgtests.qiewis6n/child495/test-clone-stream-revlog-split.t-stream-bundle2-v3.sh" 
# Ret was: 0 (test-dispatch.t) 
ok
test-exchange-obsmarkers-case-D4.t
test-exchange-obsmarkers-case-D4.t ... # Test test-exchange-obsmarkers-case-D4.t 
# Running sh "/tmp/hgtests.qiewis6n/child496/test-exchange-obsmarkers-case-D4.t.sh" 
# Timout reached for process 1153627 
# Killing daemon process 1153663 
# Daemon process 1153663 is stuck - really killing it 
# Ret was: 0 (test-clone-stream-revlog-split.t#stream-bundle2-v2) 
ok
test-eol-update.t
test-eol-update.t ... # Test test-eol-update.t 
# Running sh "/tmp/hgtests.qiewis6n/child497/test-eol-update.t.sh" 
# Timout reached for process 1153690 
# Killing daemon process 1153763 
# Daemon process 1153763 is stuck - really killing it 
# Ret was: 0 (test-clone-stream-revlog-split.t#stream-bundle2-v3) 
ok
test-narrow-exchange.t#lfs-off
test-narrow-exchange.t#lfs-off ... # Test test-narrow-exchange.t#lfs-off 
# Running sh "/tmp/hgtests.qiewis6n/child498/test-narrow-exchange.t-lfs-off.sh" 
# Timout reached for process 1153550 
# Ret was: 0 (test-repo-compengines.t) 
ok
test-narrow-exchange.t#lfs-on
test-narrow-exchange.t#lfs-on ... # Test test-narrow-exchange.t#lfs-on 
# Running sh "/tmp/hgtests.qiewis6n/child499/test-narrow-exchange.t-lfs-on.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-D4.t) 
ok
test-remotefilelog-push-pull.t
test-remotefilelog-push-pull.t ... # Test test-remotefilelog-push-pull.t 
# Timout reached for process 1153699 
# Running sh "/tmp/hgtests.qiewis6n/child500/test-remotefilelog-push-pull.t.sh" 
# Ret was: 0 (test-eol-update.t) 
ok
test-narrow-exchange-merges.t
test-narrow-exchange-merges.t ... # Test test-narrow-exchange-merges.t 
# Running sh "/tmp/hgtests.qiewis6n/child501/test-narrow-exchange-merges.t.sh" 
# Timout reached for process 1153859 
# Timout reached for process 1153912 
# Ret was: 0 (test-narrow-exchange.t#lfs-off) 
ok
test-narrow-trackedcmd.t#flat
test-narrow-trackedcmd.t#flat ... # Test test-narrow-trackedcmd.t#flat 
# Running sh "/tmp/hgtests.qiewis6n/child502/test-narrow-trackedcmd.t-flat.sh" 
# Timout reached for process 1153948 
# Ret was: 0 (test-narrow-exchange.t#lfs-on) 
ok
test-narrow-trackedcmd.t#tree
test-narrow-trackedcmd.t#tree ... # Test test-narrow-trackedcmd.t#tree 
# Running sh "/tmp/hgtests.qiewis6n/child503/test-narrow-trackedcmd.t-tree.sh" 
# Ret was: 0 (test-narrow-exchange-merges.t) 
ok
test-rename-merge1.t
test-rename-merge1.t ... # Test test-rename-merge1.t 
# Running sh "/tmp/hgtests.qiewis6n/child504/test-rename-merge1.t.sh" 
# Timout reached for process 1154070 
# Ret was: 0 (test-narrow-trackedcmd.t#flat) 
ok
test-absorb-rename.t
test-absorb-rename.t ... # Test test-absorb-rename.t 
# Running sh "/tmp/hgtests.qiewis6n/child505/test-absorb-rename.t.sh" 
# Timout reached for process 1154270 
# Timout reached for process 1154043 
# Ret was: 0 (test-remotefilelog-push-pull.t) 
ok
test-status-tracked-key.t
test-status-tracked-key.t ... # Test test-status-tracked-key.t 
# Running sh "/tmp/hgtests.qiewis6n/child506/test-status-tracked-key.t.sh" 
# Ret was: 0 (test-narrow-trackedcmd.t#tree) 
ok
test-exchange-obsmarkers-case-B5.t
test-exchange-obsmarkers-case-B5.t ... # Test test-exchange-obsmarkers-case-B5.t 
# Running sh "/tmp/hgtests.qiewis6n/child507/test-exchange-obsmarkers-case-B5.t.sh" 
# Timout reached for process 1154329 
# Ret was: 0 (test-status-tracked-key.t) 
ok
test-copy-move-merge.t
test-copy-move-merge.t ... # Test test-copy-move-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child508/test-copy-move-merge.t.sh" 
# Timout reached for process 1154587 
# Ret was: 0 (test-rename-merge1.t) 
ok
test-clone-r.t
test-clone-r.t ... # Test test-clone-r.t 
# Running sh "/tmp/hgtests.qiewis6n/child509/test-clone-r.t.sh" 
# Timout reached for process 1154448 
# Ret was: 0 (test-exchange-obsmarkers-case-B5.t) 
ok
test-pull-branch.t
test-pull-branch.t ... # Test test-pull-branch.t 
# Running sh "/tmp/hgtests.qiewis6n/child510/test-pull-branch.t.sh" 
# Timout reached for process 1154614 
# Ret was: 0 (test-absorb-rename.t) 
ok
test-eol-hook.t
test-eol-hook.t ... # Test test-eol-hook.t 
# Running sh "/tmp/hgtests.qiewis6n/child511/test-eol-hook.t.sh" 
# Timout reached for process 1154562 
# Ret was: 0 (test-copy-move-merge.t) 
ok
test-sparse-profiles.t
test-sparse-profiles.t ... # Test test-sparse-profiles.t 
# Timout reached for process 1154807 
# Running sh "/tmp/hgtests.qiewis6n/child512/test-sparse-profiles.t.sh" 
# Ret was: 0 (test-eol-hook.t) 
ok
test-obsolete-changeset-exchange.t
test-obsolete-changeset-exchange.t ... # Test test-obsolete-changeset-exchange.t 
# Running sh "/tmp/hgtests.qiewis6n/child513/test-obsolete-changeset-exchange.t.sh" 
# Timout reached for process 1154879 
# Timout reached for process 1154843 
# Ret was: 0 (test-clone-r.t) 
ok
test-remotefilelog-linknodes.t
test-remotefilelog-linknodes.t ... # Test test-remotefilelog-linknodes.t 
# Running sh "/tmp/hgtests.qiewis6n/child514/test-remotefilelog-linknodes.t.sh" 
# Ret was: 0 (test-pull-branch.t) 
ok
test-rebase-detach.t
test-rebase-detach.t ... # Test test-rebase-detach.t 
# Running sh "/tmp/hgtests.qiewis6n/child515/test-rebase-detach.t.sh" 
# Timout reached for process 1154862 
# Ret was: 0 (test-obsolete-changeset-exchange.t) 
ok
test-phase-archived.t
test-phase-archived.t ... # Test test-phase-archived.t 
# Running sh "/tmp/hgtests.qiewis6n/child516/test-phase-archived.t.sh" 
# Timout reached for process 1155040 
# Ret was: 0 (test-sparse-profiles.t) 
ok
test-symlinks.t#dirstate-v1
test-symlinks.t#dirstate-v1 ... # Test test-symlinks.t#dirstate-v1 
# Timout reached for process 1155004 
# Running sh "/tmp/hgtests.qiewis6n/child517/test-symlinks.t-dirstate-v1.sh" 
# Ret was: 0 (test-phase-archived.t) 
ok
test-symlinks.t#dirstate-v2
test-symlinks.t#dirstate-v2 ... # Test test-symlinks.t#dirstate-v2 
# Timout reached for process 1155222 
# Running sh "/tmp/hgtests.qiewis6n/child518/test-symlinks.t-dirstate-v2.sh" 
# Ret was: 0 (test-rebase-detach.t) 
ok
test-basic.t
test-basic.t ... # Test test-basic.t 
# Timout reached for process 1155127 
# Ret was: 0 (test-remotefilelog-linknodes.t) 
ok
test-strip-cross.t
test-strip-cross.t ... # Test test-strip-cross.t 
# Running sh "/tmp/hgtests.qiewis6n/child520/test-strip-cross.t.sh" 
# Timout reached for process 1155102 
# Running sh "/tmp/hgtests.qiewis6n/child519/test-basic.t.sh" 
# Timout reached for process 1155253 
# Ret was: 0 (test-symlinks.t#dirstate-v1) 
ok
test-mq-qpush-exact.t
test-mq-qpush-exact.t ... # Test test-mq-qpush-exact.t 
# Running sh "/tmp/hgtests.qiewis6n/child521/test-mq-qpush-exact.t.sh" 
# Timout reached for process 1155477 
# Ret was: 0 (test-basic.t) 
ok
test-notify-changegroup.t
test-notify-changegroup.t ... # Test test-notify-changegroup.t 
# Running sh "/tmp/hgtests.qiewis6n/child522/test-notify-changegroup.t.sh" 
# Timout reached for process 1155388 
# Ret was: 0 (test-symlinks.t#dirstate-v2) 
ok
test-hybridencode.py
test-hybridencode.py ... # Test test-hybridencode.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hybridencode.py" 
# Ret was: 0 (test-hybridencode.py) 
ok
test-bookmarks-current.t
test-bookmarks-current.t ... # Test test-bookmarks-current.t 
# Running sh "/tmp/hgtests.qiewis6n/child524/test-bookmarks-current.t.sh" 
# Timout reached for process 1155816 
# Ret was: 0 (test-notify-changegroup.t) 
ok
test-fastannotate-protocol.t
test-fastannotate-protocol.t ... # Test test-fastannotate-protocol.t 
# Running sh "/tmp/hgtests.qiewis6n/child525/test-fastannotate-protocol.t.sh" 
# Timout reached for process 1155761 
# Timout reached for process 1155457 
# Ret was: 0 (test-strip-cross.t) 
ok
test-rebase-bookmarks.t
test-rebase-bookmarks.t ... # Test test-rebase-bookmarks.t 
# Running sh "/tmp/hgtests.qiewis6n/child526/test-rebase-bookmarks.t.sh" 
# Ret was: 0 (test-fastannotate-protocol.t) 
ok
test-encoding-align.t
test-encoding-align.t ... # Test test-encoding-align.t 
# Running sh "/tmp/hgtests.qiewis6n/child527/test-encoding-align.t.sh" 
# Timout reached for process 1155884 
# Ret was: 0 (test-bookmarks-current.t) 
ok
test-inherit-mode.t
test-inherit-mode.t ... # Test test-inherit-mode.t 
# Timout reached for process 1155824 
# Running sh "/tmp/hgtests.qiewis6n/child528/test-inherit-mode.t.sh" 
# Ret was: 0 (test-encoding-align.t) 
ok
test-debugbuilddag.t
test-debugbuilddag.t ... # Test test-debugbuilddag.t 
# Running sh "/tmp/hgtests.qiewis6n/child529/test-debugbuilddag.t.sh" 
# Timout reached for process 1156133 
# Ret was: 0 (test-mq-qpush-exact.t) 
ok
test-up-local-change.t
test-up-local-change.t ... # Test test-up-local-change.t 
# Running sh "/tmp/hgtests.qiewis6n/child530/test-up-local-change.t.sh" 
# Timout reached for process 1155656 
# Timout reached for process 1156249 
# Ret was: 0 (test-inherit-mode.t) 
ok
test-convert-baz.t
test-convert-baz.t ... # Test test-convert-baz.t 
# Running sh "/tmp/hgtests.qiewis6n/child531/test-convert-baz.t.sh" 
skipped missing feature: GNU Arch baz client
# Ret was: 80 (test-convert-baz.t) 
test-convert-hg-source.t
test-convert-hg-source.t ... # Test test-convert-hg-source.t 
# Timout reached for process 1156340 
# Running sh "/tmp/hgtests.qiewis6n/child532/test-convert-hg-source.t.sh" 
# Ret was: 0 (test-rebase-bookmarks.t) 
ok
test-remotefilelog-local.t
test-remotefilelog-local.t ... # Test test-remotefilelog-local.t 
# Timout reached for process 1155977 
# Running sh "/tmp/hgtests.qiewis6n/child533/test-remotefilelog-local.t.sh" 
# Ret was: 0 (test-debugbuilddag.t) 
ok
test-byteify-strings.t
test-byteify-strings.t ... # Test test-byteify-strings.t 
# Timout reached for process 1156271 
# Running sh "/tmp/hgtests.qiewis6n/child534/test-byteify-strings.t.sh" 
# Ret was: 0 (test-byteify-strings.t) 
ok
test-releasenotes-merging.t
test-releasenotes-merging.t ... # Test test-releasenotes-merging.t 
# Timout reached for process 1156444 
# Running sh "/tmp/hgtests.qiewis6n/child535/test-releasenotes-merging.t.sh" 
skipped missing feature: Fuzzy string matching library
# Ret was: 80 (test-releasenotes-merging.t) 
test-convert-hg-startrev.t
test-convert-hg-startrev.t ... # Test test-convert-hg-startrev.t 
# Running sh "/tmp/hgtests.qiewis6n/child536/test-convert-hg-startrev.t.sh" 
# Timout reached for process 1156480 
# Ret was: 0 (test-up-local-change.t) 
ok
test-narrow-expanddirstate.t
test-narrow-expanddirstate.t ... # Test test-narrow-expanddirstate.t 
# Running sh "/tmp/hgtests.qiewis6n/child537/test-narrow-expanddirstate.t.sh" 
# Timout reached for process 1156282 
# Ret was: 0 (test-convert-hg-source.t) 
ok
test-show-work.t
test-show-work.t ... # Test test-show-work.t 
# Running sh "/tmp/hgtests.qiewis6n/child538/test-show-work.t.sh" 
# Timout reached for process 1156358 
# Ret was: 0 (test-convert-hg-startrev.t) 
ok
test-narrow-strip.t#flat#lfs-off
test-narrow-strip.t#flat#lfs-off ... # Test test-narrow-strip.t#flat#lfs-off 
# Timout reached for process 1156484 
# Running sh "/tmp/hgtests.qiewis6n/child539/test-narrow-strip.t-flat-lfs-off.sh" 
# Ret was: 0 (test-narrow-expanddirstate.t) 
ok
# Timout reached for process 1156614 
test-narrow-strip.t#flat#lfs-on
test-narrow-strip.t#flat#lfs-on ... # Test test-narrow-strip.t#flat#lfs-on 
# Running sh "/tmp/hgtests.qiewis6n/child540/test-narrow-strip.t-flat-lfs-on.sh" 
# Ret was: 0 (test-remotefilelog-local.t) 
ok
test-narrow-strip.t#tree#lfs-off
test-narrow-strip.t#tree#lfs-off ... # Test test-narrow-strip.t#tree#lfs-off 
# Timout reached for process 1156419 
# Running sh "/tmp/hgtests.qiewis6n/child541/test-narrow-strip.t-tree-lfs-off.sh" 
# Timout reached for process 1156726 
# Ret was: 0 (test-narrow-strip.t#flat#lfs-off) 
ok
test-narrow-strip.t#tree#lfs-on
test-narrow-strip.t#tree#lfs-on ... # Test test-narrow-strip.t#tree#lfs-on 
# Running sh "/tmp/hgtests.qiewis6n/child542/test-narrow-strip.t-tree-lfs-on.sh" 
# Ret was: 0 (test-narrow-strip.t#flat#lfs-on) 
ok
test-merge-commit.t
test-merge-commit.t ... # Test test-merge-commit.t 
# Running sh "/tmp/hgtests.qiewis6n/child543/test-merge-commit.t.sh" 
# Timout reached for process 1156789 
# Ret was: 0 (test-narrow-strip.t#tree#lfs-off) 
ok
test-audit-path.t
test-audit-path.t ... # Test test-audit-path.t 
# Timout reached for process 1156872 
# Running sh "/tmp/hgtests.qiewis6n/child544/test-audit-path.t.sh" 
# Ret was: 0 (test-narrow-strip.t#tree#lfs-on) 
ok
test-exchange-obsmarkers-case-B4.t
test-exchange-obsmarkers-case-B4.t ... # Test test-exchange-obsmarkers-case-B4.t 
# Running sh "/tmp/hgtests.qiewis6n/child545/test-exchange-obsmarkers-case-B4.t.sh" 
# Timout reached for process 1156911 
# Timout reached for process 1156961 
# Ret was: 0 (test-merge-commit.t) 
ok
test-fastannotate.t
test-fastannotate.t ... # Test test-fastannotate.t 
# Running sh "/tmp/hgtests.qiewis6n/child546/test-fastannotate.t.sh" 
# Ret was: 0 (test-show-work.t) 
ok
test-lock-badness.t
test-lock-badness.t ... # Test test-lock-badness.t 
# Timout reached for process 1156677 
# Running sh "/tmp/hgtests.qiewis6n/child547/test-lock-badness.t.sh" 
# Timout reached for process 1157069 
# Ret was: 0 (test-exchange-obsmarkers-case-B4.t) 
ok
test-remotefilelog-gcrepack.t
test-remotefilelog-gcrepack.t ... # Test test-remotefilelog-gcrepack.t 
# Running sh "/tmp/hgtests.qiewis6n/child548/test-remotefilelog-gcrepack.t.sh" 
# Ret was: 0 (test-audit-path.t) 
ok
test-pathconflicts-merge.t
test-pathconflicts-merge.t ... # Test test-pathconflicts-merge.t 
# Timout reached for process 1157032 
# Running sh "/tmp/hgtests.qiewis6n/child549/test-pathconflicts-merge.t.sh" 
# Ret was: 0 (test-lock-badness.t) 
ok
test-exchange-obsmarkers-case-C4.t
test-exchange-obsmarkers-case-C4.t ... # Test test-exchange-obsmarkers-case-C4.t 
# Running sh "/tmp/hgtests.qiewis6n/child550/test-exchange-obsmarkers-case-C4.t.sh" 
# Timout reached for process 1157197 
# Ret was: 0 (test-fastannotate.t) 
ok
test-mq-safety.t
test-mq-safety.t ... # Test test-mq-safety.t 
# Running sh "/tmp/hgtests.qiewis6n/child551/test-mq-safety.t.sh" 
# Timout reached for process 1157118 
# Ret was: 0 (test-remotefilelog-gcrepack.t) 
ok
test-profile.t
test-profile.t ... # Test test-profile.t 
# Timout reached for process 1157409 
# Running sh "/tmp/hgtests.qiewis6n/child552/test-profile.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-C4.t) 
ok
test-directaccess.t
test-directaccess.t ... # Test test-directaccess.t 
# Running sh "/tmp/hgtests.qiewis6n/child553/test-directaccess.t.sh" 
# Timout reached for process 1157441 
# Ret was: 0 (test-pathconflicts-merge.t) 
ok
test-exchange-obsmarkers-case-A6.t
test-exchange-obsmarkers-case-A6.t ... # Test test-exchange-obsmarkers-case-A6.t 
# Running sh "/tmp/hgtests.qiewis6n/child554/test-exchange-obsmarkers-case-A6.t.sh" 
# Timout reached for process 1157423 
# Timout reached for process 1157616 
# Timout reached for process 1157769 
# Timout reached for process 1157705 
# Ret was: 0 (test-profile.t) 
ok
# Ret was: 0 (test-directaccess.t) 
test-exchange-obsmarkers-case-A5.t
test-exchange-obsmarkers-case-A5.ttest-directaccess.t
test-directaccess.t ... ok
 ... test-obsolete-tag-cache.t
test-obsolete-tag-cache.t ... # Test test-exchange-obsmarkers-case-A5.t 
# Test test-obsolete-tag-cache.t 
# Running sh "/tmp/hgtests.qiewis6n/child555/test-exchange-obsmarkers-case-A5.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child556/test-obsolete-tag-cache.t.sh" 
# Ret was: 0 (test-mq-safety.t) 
ok
test-histedit-bookmark-motion.t
test-histedit-bookmark-motion.t ... # Test test-histedit-bookmark-motion.t 
# Running sh "/tmp/hgtests.qiewis6n/child557/test-histedit-bookmark-motion.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-A6.t) 
ok
test-hgweb-csp.t
test-hgweb-csp.t ... # Test test-hgweb-csp.t 
# Timout reached for process 1157488 
# Running sh "/tmp/hgtests.qiewis6n/child558/test-hgweb-csp.t.sh" 
# Ret was: 0 (test-obsolete-tag-cache.t) 
ok
test-histedit-non-commute-abort.t
test-histedit-non-commute-abort.t ... # Test test-histedit-non-commute-abort.t 
# Running sh "/tmp/hgtests.qiewis6n/child559/test-histedit-non-commute-abort.t.sh" 
# Timout reached for process 1157904 
# Killing daemon process 1158033 
# Timout reached for process 1157925 
# Daemon process 1158033 is stuck - really killing it 
# Ret was: 0 (test-hgweb-csp.t) 
ok
test-narrow-share.t#flat#normal
test-narrow-share.t#flat#normal ... # Test test-narrow-share.t#flat#normal 
# Running sh "/tmp/hgtests.qiewis6n/child560/test-narrow-share.t-flat-normal.sh" 
# Ret was: 0 (test-histedit-bookmark-motion.t) 
ok
test-narrow-share.t#flat#safe
test-narrow-share.t#flat#safe ... # Test test-narrow-share.t#flat#safe 
# Timout reached for process 1157915 
# Running sh "/tmp/hgtests.qiewis6n/child561/test-narrow-share.t-flat-safe.sh" 
# Timout reached for process 1157902 
# Ret was: 0 (test-exchange-obsmarkers-case-A5.t) 
ok
test-narrow-share.t#tree#normal
test-narrow-share.t#tree#normal ... # Test test-narrow-share.t#tree#normal 
# Running sh "/tmp/hgtests.qiewis6n/child562/test-narrow-share.t-tree-normal.sh" 
# Ret was: 0 (test-histedit-non-commute-abort.t) 
ok
test-narrow-share.t#tree#safe
test-narrow-share.t#tree#safe ... # Test test-narrow-share.t#tree#safe 
# Timout reached for process 1158039 
# Running sh "/tmp/hgtests.qiewis6n/child563/test-narrow-share.t-tree-safe.sh" 
# Timout reached for process 1158061 
# Ret was: 0 (test-narrow-share.t#flat#normal) 
ok
test-merge-default.t
test-merge-default.t ... # Test test-merge-default.t 
# Running sh "/tmp/hgtests.qiewis6n/child564/test-merge-default.t.sh" 
# Timout reached for process 1158107 
# Ret was: 0 (test-narrow-share.t#flat#safe) 
ok
test-log-bookmark.t
test-log-bookmark.t ... # Test test-log-bookmark.t 
# Running sh "/tmp/hgtests.qiewis6n/child565/test-log-bookmark.t.sh" 
# Ret was: 0 (test-narrow-share.t#tree#normal) 
ok
test-mq-qfold.t
test-mq-qfold.t ... # Test test-mq-qfold.t 
# Running sh "/tmp/hgtests.qiewis6n/child566/test-mq-qfold.t.sh" 
# Timout reached for process 1158177 
# Ret was: 0 (test-narrow-share.t#tree#safe) 
ok
test-http-clone-r.t
test-http-clone-r.t ... # Test test-http-clone-r.t 
# Timout reached for process 1158270 
# Running sh "/tmp/hgtests.qiewis6n/child567/test-http-clone-r.t.sh" 
# Ret was: 0 (test-merge-default.t) 
ok
test-diff-binary-file.t
test-diff-binary-file.t ... # Test test-diff-binary-file.t 
# Running sh "/tmp/hgtests.qiewis6n/child568/test-diff-binary-file.t.sh" 
# Timout reached for process 1158476 
# Ret was: 0 (test-log-bookmark.t) 
ok
test-journal-share.t#normal
test-journal-share.t#normal ... # Test test-journal-share.t#normal 
# Running sh "/tmp/hgtests.qiewis6n/child569/test-journal-share.t-normal.sh" 
# Timout reached for process 1158514 
# Ret was: 0 (test-mq-qfold.t) 
ok
test-journal-share.t#safe
test-journal-share.t#safe ... # Test test-journal-share.t#safe 
# Timout reached for process 1158560 
# Running sh "/tmp/hgtests.qiewis6n/child570/test-journal-share.t-safe.sh" 
# Ret was: 0 (test-diff-binary-file.t) 
ok
test-merge-halt.t
test-merge-halt.t ... # Test test-merge-halt.t 
# Running sh "/tmp/hgtests.qiewis6n/child571/test-merge-halt.t.sh" 
# Timout reached for process 1158654 
# Killing daemon process 1158644 
# Timout reached for process 1158625 
# Daemon process 1158644 is stuck - really killing it 
# Ret was: 0 (test-http-clone-r.t) 
ok
test-casefolding.t
test-casefolding.t ... # Test test-casefolding.t 
# Ret was: 0 (test-journal-share.t#normal) 
ok
test-mq-git.t
test-mq-git.t ... # Timout reached for process 1158700 
# Test test-mq-git.t 
# Running sh "/tmp/hgtests.qiewis6n/child573/test-mq-git.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child572/test-casefolding.t.sh" 
skipped missing feature: case insensitive file system
# Ret was: 80 (test-casefolding.t) 
test-patchbomb-bookmark.t
test-patchbomb-bookmark.t ... # Test test-patchbomb-bookmark.t 
# Running sh "/tmp/hgtests.qiewis6n/child574/test-patchbomb-bookmark.t.sh" 
# Timout reached for process 1158875 
# Ret was: 0 (test-patchbomb-bookmark.t) 
ok
test-stack.t
test-stack.t ... # Ret was: 0 (test-journal-share.t#safe) 
# Test test-stack.t 
ok
# Running sh "/tmp/hgtests.qiewis6n/child575/test-stack.t.sh" 
test-default-push.t
test-default-push.t ... # Timout reached for process 1158795 
# Test test-default-push.t 
# Timout reached for process 1158879 
# Running sh "/tmp/hgtests.qiewis6n/child576/test-default-push.t.sh" 
# Ret was: 0 (test-mq-git.t) 
ok
test-sparse-merges.t
test-sparse-merges.t ... # Test test-sparse-merges.t 
# Running sh "/tmp/hgtests.qiewis6n/child577/test-sparse-merges.t.sh" 
# Timout reached for process 1158869 
# Ret was: 0 (test-merge-halt.t) 
ok
test-remotefilelog-cacheprocess.t
test-remotefilelog-cacheprocess.t ... # Test test-remotefilelog-cacheprocess.t 
# Timout reached for process 1158816 
# Running sh "/tmp/hgtests.qiewis6n/child578/test-remotefilelog-cacheprocess.t.sh" 
# Ret was: 0 (test-remotefilelog-cacheprocess.t) 
ok
test-pull-r.t
test-pull-r.t ... # Test test-pull-r.t 
# Running sh "/tmp/hgtests.qiewis6n/child579/test-pull-r.t.sh" 
# Timout reached for process 1159057 
# Ret was: 0 (test-default-push.t) 
ok
test-match.py
test-match.py ... # Test test-match.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-match.py" 
# Timout reached for process 1158982 
# Ret was: 0 (test-match.py) 
ok
test-contrib-testparseutil.t
test-contrib-testparseutil.t ... # Test test-contrib-testparseutil.t 
# Running sh "/tmp/hgtests.qiewis6n/child581/test-contrib-testparseutil.t.sh" 
# Timout reached for process 1159201 
# Ret was: 0 (test-contrib-testparseutil.t) 
ok
# Timout reached for process 1159209 
test-ssh-clone-r.t
test-ssh-clone-r.t ... # Test test-ssh-clone-r.t 
# Running sh "/tmp/hgtests.qiewis6n/child582/test-ssh-clone-r.t.sh" 
# Ret was: 0 (test-stack.t) 
ok
test-hgweb-no-request-uri.t
test-hgweb-no-request-uri.t ... # Timout reached for process 1158971 
# Test test-hgweb-no-request-uri.t 
# Running sh "/tmp/hgtests.qiewis6n/child583/test-hgweb-no-request-uri.t.sh" 
# Ret was: 0 (test-hgweb-no-request-uri.t) 
ok
test-releasenotes-parsing.t
test-releasenotes-parsing.t ... # Test test-releasenotes-parsing.t 
# Timout reached for process 1159319 
# Ret was: 0 (test-sparse-merges.t) 
ok
test-rebase-emptycommit.t
test-rebase-emptycommit.t ... # Test test-rebase-emptycommit.t 
# Running sh "/tmp/hgtests.qiewis6n/child585/test-rebase-emptycommit.t.sh" 
# Timout reached for process 1159039 
# Running sh "/tmp/hgtests.qiewis6n/child584/test-releasenotes-parsing.t.sh" 
skipped missing feature: Fuzzy string matching library
# Ret was: 80 (test-releasenotes-parsing.t) 
test-diff-indent-heuristic.t#bdiff
test-diff-indent-heuristic.t#bdiff ... # Test test-diff-indent-heuristic.t#bdiff 
# Running sh "/tmp/hgtests.qiewis6n/child586/test-diff-indent-heuristic.t-bdiff.sh" 
# Timout reached for process 1159369 
# Ret was: 0 (test-pull-r.t) 
ok
test-diff-indent-heuristic.t#xdiff
test-diff-indent-heuristic.t#xdiff ... # Test test-diff-indent-heuristic.t#xdiff 
# Timout reached for process 1159178 
# Ret was: 0 (test-diff-indent-heuristic.t#bdiff) 
ok
test-narrow-merge-outside.t
test-narrow-merge-outside.t ... # Test test-narrow-merge-outside.t 
# Running sh "/tmp/hgtests.qiewis6n/child588/test-narrow-merge-outside.t.sh" 
# Timout reached for process 1159373 
# Running sh "/tmp/hgtests.qiewis6n/child587/test-diff-indent-heuristic.t-xdiff.sh" 
# Ret was: 0 (test-diff-indent-heuristic.t#xdiff) 
ok
test-drawdag.t
test-drawdag.t ... # Test test-drawdag.t 
# Running sh "/tmp/hgtests.qiewis6n/child589/test-drawdag.t.sh" 
# Timout reached for process 1159416 
# Ret was: 0 (test-ssh-clone-r.t) 
ok
test-exchange-obsmarkers-case-B2.t
test-exchange-obsmarkers-case-B2.t ... # Test test-exchange-obsmarkers-case-B2.t 
# Running sh "/tmp/hgtests.qiewis6n/child590/test-exchange-obsmarkers-case-B2.t.sh" 
# Timout reached for process 1159222 
# Ret was: 0 (test-narrow-merge-outside.t) 
ok
test-convert-bzr-directories.t
test-convert-bzr-directories.t ... # Test test-convert-bzr-directories.t 
# Timout reached for process 1159410 
# Running sh "/tmp/hgtests.qiewis6n/child591/test-convert-bzr-directories.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr-directories.t) 
test-convert-p4.t
test-convert-p4.t ... # Test test-convert-p4.t 
# Timout reached for process 1159582 
# Running sh "/tmp/hgtests.qiewis6n/child592/test-convert-p4.t.sh" 
skipped missing feature: Perforce server and client
# Ret was: 80 (test-convert-p4.t) 
test-pullling-to-general-delta.t
test-pullling-to-general-delta.t ... # Test test-pullling-to-general-delta.t 
# Running sh "/tmp/hgtests.qiewis6n/child593/test-pullling-to-general-delta.t.sh" 
# Timout reached for process 1159590 
# Ret was: 0 (test-rebase-emptycommit.t) 
ok
test-show-stack.t
test-show-stack.t ... # Test test-show-stack.t 
# Running sh "/tmp/hgtests.qiewis6n/child594/test-show-stack.t.sh" 
# Timout reached for process 1159363 
# Timout reached for process 1159594 
# Ret was: 0 (test-pullling-to-general-delta.t) 
ok
test-narrow-clone-nonlinear.t
test-narrow-clone-nonlinear.t ... # Test test-narrow-clone-nonlinear.t 
# Running sh "/tmp/hgtests.qiewis6n/child595/test-narrow-clone-nonlinear.t.sh" 
# Ret was: 0 (test-drawdag.t) 
ok
test-repair-strip.t
test-repair-strip.t ... # Test test-repair-strip.t 
# Timout reached for process 1159450 
# Running sh "/tmp/hgtests.qiewis6n/child596/test-repair-strip.t.sh" 
# Timout reached for process 1159549 
# Ret was: 0 (test-exchange-obsmarkers-case-B2.t) 
ok
test-mq-eol.t
test-mq-eol.t ... # Test test-mq-eol.t 
# Running sh "/tmp/hgtests.qiewis6n/child597/test-mq-eol.t.sh" 
# Ret was: 0 (test-repair-strip.t) 
ok
test-state-extension.t
test-state-extension.t ... # Test test-state-extension.t 
# Running sh "/tmp/hgtests.qiewis6n/child598/test-state-extension.t.sh" 
# Timout reached for process 1159690 
# Ret was: 0 (test-state-extension.t) 
ok
test-exchange-obsmarkers-case-A4.t
test-exchange-obsmarkers-case-A4.t ... # Test test-exchange-obsmarkers-case-A4.t 
# Running sh "/tmp/hgtests.qiewis6n/child599/test-exchange-obsmarkers-case-A4.t.sh" 
# Timout reached for process 1159831 
# Ret was: 0 (test-mq-eol.t) 
ok
test-import-merge.t
test-import-merge.t ... # Test test-import-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child600/test-import-merge.t.sh" 
# Timout reached for process 1159779 
# Ret was: 0 (test-show-stack.t) 
ok
test-obsmarkers-effectflag.t
test-obsmarkers-effectflag.t ... # Test test-obsmarkers-effectflag.t 
# Running sh "/tmp/hgtests.qiewis6n/child601/test-obsmarkers-effectflag.t.sh" 
# Timout reached for process 1159643 
# Timout reached for process 1159903 
# Ret was: 0 (test-exchange-obsmarkers-case-A4.t) 
ok
test-bookmarks-merge.t
test-bookmarks-merge.t ... # Test test-bookmarks-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child602/test-bookmarks-merge.t.sh" 
# Ret was: 0 (test-narrow-clone-nonlinear.t) 
ok
test-fastannotate-renames.t
test-fastannotate-renames.t ... # Test test-fastannotate-renames.t 
# Running sh "/tmp/hgtests.qiewis6n/child603/test-fastannotate-renames.t.sh" 
# Timout reached for process 1159681 
# Ret was: 0 (test-import-merge.t) 
ok
test-histedit-drop.t
test-histedit-drop.t ... # Test test-histedit-drop.t 
# Running sh "/tmp/hgtests.qiewis6n/child604/test-histedit-drop.t.sh" 
# Timout reached for process 1159920 
# Ret was: 0 (test-obsmarkers-effectflag.t) 
ok
test-histedit-outgoing.t
test-histedit-outgoing.t ... # Test test-histedit-outgoing.t 
# Running sh "/tmp/hgtests.qiewis6n/child605/test-histedit-outgoing.t.sh" 
# Timout reached for process 1159969 
# Ret was: 0 (test-bookmarks-merge.t) 
ok
test-rebase-mq-skip.t#continuecommand
test-rebase-mq-skip.t#continuecommand ... # Test test-rebase-mq-skip.t#continuecommand 
# Running sh "/tmp/hgtests.qiewis6n/child606/test-rebase-mq-skip.t-continuecommand.sh" 
# Timout reached for process 1160066 
# Ret was: 0 (test-fastannotate-renames.t) 
ok
test-rebase-mq-skip.t#continueflag
test-rebase-mq-skip.t#continueflag ... # Test test-rebase-mq-skip.t#continueflag 
# Ret was: 0 (test-histedit-drop.t) 
ok
test-sidedata.t
test-sidedata.t ... # Test test-sidedata.t 
# Running sh "/tmp/hgtests.qiewis6n/child608/test-sidedata.t.sh" 
# Timout reached for process 1160138 
# Timout reached for process 1160199 
# Running sh "/tmp/hgtests.qiewis6n/child607/test-rebase-mq-skip.t-continueflag.sh" 
# Ret was: 0 (test-sidedata.t) 
ok
test-rebase-templates.t
test-rebase-templates.t ... # Test test-rebase-templates.t 
# Running sh "/tmp/hgtests.qiewis6n/child609/test-rebase-templates.t.sh" 
# Timout reached for process 1160361 
# Ret was: 0 (test-histedit-outgoing.t) 
ok
test-extension-timing.t
test-extension-timing.t ... # Timout reached for process 1160260 
# Test test-extension-timing.t 
# Running sh "/tmp/hgtests.qiewis6n/child610/test-extension-timing.t.sh" 
# Ret was: 0 (test-extension-timing.t) 
ok
test-exchange-obsmarkers-case-B6.t
test-exchange-obsmarkers-case-B6.t ... # Test test-exchange-obsmarkers-case-B6.t 
# Running sh "/tmp/hgtests.qiewis6n/child611/test-exchange-obsmarkers-case-B6.t.sh" 
# Timout reached for process 1160488 
# Ret was: 0 (test-rebase-templates.t) 
ok
test-cbor.py
test-cbor.py ... # Test test-cbor.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-cbor.py" 
# Timout reached for process 1160460 
# Ret was: 0 (test-cbor.py) 
ok
test-narrow-merge.t#flat
test-narrow-merge.t#flat ... # Test test-narrow-merge.t#flat 
# Timout reached for process 1160574 
# Running sh "/tmp/hgtests.qiewis6n/child613/test-narrow-merge.t-flat.sh" 
# Ret was: 0 (test-rebase-mq-skip.t#continuecommand) 
ok
test-narrow-merge.t#tree
test-narrow-merge.t#tree ... # Test test-narrow-merge.t#tree 
# Timout reached for process 1160350 
# Running sh "/tmp/hgtests.qiewis6n/child614/test-narrow-merge.t-tree.sh" 
# Ret was: 0 (test-rebase-mq-skip.t#continueflag) 
ok
test-debugbundle.t
test-debugbundle.t ... # Test test-debugbundle.t 
# Running sh "/tmp/hgtests.qiewis6n/child615/test-debugbundle.t.sh" 
# Timout reached for process 1160367 
# Ret was: 0 (test-debugbundle.t) 
ok
test-convert-tla.t
test-convert-tla.t ... # Test test-convert-tla.t 
# Timout reached for process 1160614 
# Running sh "/tmp/hgtests.qiewis6n/child616/test-convert-tla.t.sh" 
skipped missing feature: GNU Arch tla client
# Ret was: 80 (test-convert-tla.t) 
test-mq-qclone-http.t
test-mq-qclone-http.t ... # Test test-mq-qclone-http.t 
# Running sh "/tmp/hgtests.qiewis6n/child617/test-mq-qclone-http.t.sh" 
# Timout reached for process 1160694 
# Ret was: 0 (test-exchange-obsmarkers-case-B6.t) 
ok
test-exchange-obsmarkers-case-A2.t
test-exchange-obsmarkers-case-A2.t ... # Test test-exchange-obsmarkers-case-A2.t 
# Running sh "/tmp/hgtests.qiewis6n/child618/test-exchange-obsmarkers-case-A2.t.sh" 
# Timout reached for process 1160512 
# Ret was: 0 (test-narrow-merge.t#tree) 
ok
test-exchange-obsmarkers-case-D2.t
test-exchange-obsmarkers-case-D2.t ... # Test test-exchange-obsmarkers-case-D2.t 
# Running sh "/tmp/hgtests.qiewis6n/child619/test-exchange-obsmarkers-case-D2.t.sh" 
# Timout reached for process 1160605 
# Timout reached for process 1160585 
# Ret was: 0 (test-narrow-merge.t#flat) 
ok
test-status-terse.t
test-status-terse.t ... # Test test-status-terse.t 
# Running sh "/tmp/hgtests.qiewis6n/child620/test-status-terse.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-A2.t) 
ok
test-patchbomb-tls.t
test-patchbomb-tls.t ... # Test test-patchbomb-tls.t 
# Timout reached for process 1160711 
# Running sh "/tmp/hgtests.qiewis6n/child621/test-patchbomb-tls.t.sh" 
# Ret was: 0 (test-mq-qclone-http.t) 
ok
test-pathconflicts-update.t
test-pathconflicts-update.t ... # Test test-pathconflicts-update.t 
# Timout reached for process 1160698 
# Running sh "/tmp/hgtests.qiewis6n/child622/test-pathconflicts-update.t.sh" 
# Timout reached for process 1160911 
# Killing daemon process 1160923 
# Ret was: 0 (test-patchbomb-tls.t) 
ok
test-hgweb-no-path-info.t
test-hgweb-no-path-info.t ... # Test test-hgweb-no-path-info.t 
# Running sh "/tmp/hgtests.qiewis6n/child623/test-hgweb-no-path-info.t.sh" 
# Ret was: 0 (test-hgweb-no-path-info.t) 
ok
test-show.t
test-show.t ... # Test test-show.t 
# Running sh "/tmp/hgtests.qiewis6n/child624/test-show.t.sh" 
# Timout reached for process 1160987 
# Ret was: 0 (test-exchange-obsmarkers-case-D2.t) 
ok
test-racy-mutations.t#fail-if-detected
test-racy-mutations.t#fail-if-detected ... # Test test-racy-mutations.t#fail-if-detected 
# Timout reached for process 1160799 
# Running sh "/tmp/hgtests.qiewis6n/child625/test-racy-mutations.t-fail-if-detected.sh" 
# Ret was: 0 (test-status-terse.t) 
ok
test-racy-mutations.t#skip-detection
test-racy-mutations.t#skip-detection ... # Test test-racy-mutations.t#skip-detection 
# Timout reached for process 1160854 
# Running sh "/tmp/hgtests.qiewis6n/child626/test-racy-mutations.t-skip-detection.sh" 
# Timout reached for process 1161031 
# Ret was: 0 (test-racy-mutations.t#fail-if-detected) 
ok
test-addremove-similar.t
test-addremove-similar.t ... # Test test-addremove-similar.t 
# Running sh "/tmp/hgtests.qiewis6n/child627/test-addremove-similar.t.sh" 
# Ret was: 0 (test-racy-mutations.t#skip-detection) 
ok
test-contrib.t
test-contrib.t ... # Test test-contrib.t 
# Running sh "/tmp/hgtests.qiewis6n/child628/test-contrib.t.sh" 
# Timout reached for process 1161277 
# Ret was: 0 (test-contrib.t) 
ok
test-merge-subrepos.t
test-merge-subrepos.t ... # Test test-merge-subrepos.t 
# Running sh "/tmp/hgtests.qiewis6n/child629/test-merge-subrepos.t.sh" 
# Timout reached for process 1161543 
# Ret was: 0 (test-show.t) 
ok
test-worker.t
test-worker.t ... # Test test-worker.t 
# Timout reached for process 1161019 
# Running sh "/tmp/hgtests.qiewis6n/child630/test-worker.t.sh" 
# Ret was: 0 (test-pathconflicts-update.t) 
ok
test-merge7.t
test-merge7.t ... # Test test-merge7.t 
# Running sh "/tmp/hgtests.qiewis6n/child631/test-merge7.t.sh" 
# Timout reached for process 1160944 
# Ret was: 0 (test-worker.t) 
ok
test-flags.t
test-flags.t ... # Test test-flags.t 
# Timout reached for process 1161623 
# Running sh "/tmp/hgtests.qiewis6n/child632/test-flags.t.sh" 
# Ret was: 0 (test-addremove-similar.t) 
ok
test-commit-multiple.t
test-commit-multiple.t ... # Test test-commit-multiple.t 
# Running sh "/tmp/hgtests.qiewis6n/child633/test-commit-multiple.t.sh" 
# Timout reached for process 1161289 
# Ret was: 0 (test-merge7.t) 
ok
test-commit-unresolved.t#abortcommand
test-commit-unresolved.t#abortcommand ... # Test test-commit-unresolved.t#abortcommand 
# Timout reached for process 1161648 
# Running sh "/tmp/hgtests.qiewis6n/child634/test-commit-unresolved.t-abortcommand.sh" 
# Timout reached for process 1161605 
# Ret was: 0 (test-flags.t) 
ok
test-commit-unresolved.t#abortflag
test-commit-unresolved.t#abortflag ... # Test test-commit-unresolved.t#abortflag 
# Timout reached for process 1161732 
# Ret was: 0 (test-merge-subrepos.t) 
ok
test-import-eol.t
test-import-eol.t ... # Test test-import-eol.t 
# Running sh "/tmp/hgtests.qiewis6n/child636/test-import-eol.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child635/test-commit-unresolved.t-abortflag.sh" 
# Ret was: 0 (test-commit-multiple.t) 
ok
test-subrepo-missing.t
test-subrepo-missing.t ... # Test test-subrepo-missing.t 
# Running sh "/tmp/hgtests.qiewis6n/child637/test-subrepo-missing.t.sh" 
# Timout reached for process 1161755 
# Ret was: 0 (test-commit-unresolved.t#abortcommand) 
ok
test-sparse-import.t
test-sparse-import.t ... # Test test-sparse-import.t 
# Running sh "/tmp/hgtests.qiewis6n/child638/test-sparse-import.t.sh" 
# Timout reached for process 1161788 
# Timout reached for process 1161885 
# Ret was: 0 (test-subrepo-missing.t) 
ok
test-narrow-clone-no-ellipsis.t
test-narrow-clone-no-ellipsis.t ... # Test test-narrow-clone-no-ellipsis.t 
# Running sh "/tmp/hgtests.qiewis6n/child639/test-narrow-clone-no-ellipsis.t.sh" 
# Timout reached for process 1161861 
# Ret was: 0 (test-commit-unresolved.t#abortflag) 
ok
test-amend-subrepo.t#obsstore-off
test-amend-subrepo.t#obsstore-off ... # Test test-amend-subrepo.t#obsstore-off 
# Running sh "/tmp/hgtests.qiewis6n/child640/test-amend-subrepo.t-obsstore-off.sh" 
# Ret was: 0 (test-import-eol.t) 
ok
test-amend-subrepo.t#obsstore-on
test-amend-subrepo.t#obsstore-on ... # Test test-amend-subrepo.t#obsstore-on 
# Timout reached for process 1161856 
# Running sh "/tmp/hgtests.qiewis6n/child641/test-amend-subrepo.t-obsstore-on.sh" 
# Ret was: 0 (test-sparse-import.t) 
ok
test-unionrepo.t
test-unionrepo.t ... # Test test-unionrepo.t 
# Timout reached for process 1161981 
# Running sh "/tmp/hgtests.qiewis6n/child642/test-unionrepo.t.sh" 
# Ret was: 0 (test-amend-subrepo.t#obsstore-off) 
ok
test-identify.t
test-identify.t ... # Test test-identify.t 
# Timout reached for process 1162076 
# Ret was: 0 (test-amend-subrepo.t#obsstore-on) 
ok
test-rebase-transaction.t#continuecommand
test-rebase-transaction.t#continuecommand ... # Test test-rebase-transaction.t#continuecommand 
# Running sh "/tmp/hgtests.qiewis6n/child644/test-rebase-transaction.t-continuecommand.sh" 
# Timout reached for process 1162090 

--- /<<PKGBUILDDIR>>/tests/test-unionrepo.t
+++ /<<PKGBUILDDIR>>/tests/test-unionrepo.t.err
@@ -36,12 +36,15 @@
   $ hg pull -q ../repo1 -r 1
   $ hg merge -q
   $ hg ci -Aqmrepo2-2-merge
+  Bus error
+  [135]
   $ touch repo2-3
   $ echo repo2-3 >> f
   $ hg ci -mrepo2-3
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --template '{rev}:{node|short}  {desc|firstline}\n'
-  4:2f0d178c469c  repo2-3
-  3:9e6fb3e0b9da  repo2-2-merge
   2:8a58db72e69d  repo1-1
   1:c337dba826e7  repo2-1
   0:f093fec0529b  repo1-0
@@ -50,8 +53,6 @@
 revisions from repo2 appear as appended / pulled to repo1
 
   $ hg -R union:repo1+repo2 log --template '{rev}:{node|short}  {desc|firstline}\n'
-  5:2f0d178c469c  repo2-3
-  4:9e6fb3e0b9da  repo2-2-merge
   3:c337dba826e7  repo2-1
   2:68c0685446a3  repo1-2
   1:8a58db72e69d  repo1-1
@@ -65,11 +66,8 @@
   repo1-1
   repo1-2
   $ hg -R union:repo1+repo2 mani -r 4
-  f
-  repo1-0
-  repo1-1
-  repo2-1
-  repo2-2
+  abort: unknown revision '4'
+  [10]
 
 files can be retrieved form both repos
 
@@ -79,73 +77,424 @@
   repo1-2
 
   $ hg -R union:repo1+repo2 cat -r$tip1 repo1/f
-  repo1-0
-  repo1-1
-  repo1-2
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: 
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/commands.py", line 1859, in cat
+      return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, b'', **opts)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/cmdutil.py", line 2795, in cat
+      write(file)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/cmdutil.py", line 2783, in write
+      _updatecatformatter(fm, ctx, matcher, path, opts.get('decode'))
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/cmdutil.py", line 2759, in _updatecatformatter
+      data = ctx[path].data()
+             ^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 1327, in data
+      return self._filelog.read(self._filenode)
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1766, in __get__
+      result = self.func(obj)
+               ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 806, in _filelog
+      return self._repo.file(self._path)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 279, in file
+      return unionfilelog(
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 221, in __init__
+      self._revlog = unionrevlog(
+                     ^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 82, in __init__
+      link = linkmapper(linkrev)
+             ^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 272, in _clrev
+      node = self.repo2.changelog.node(rev2)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/revlog.py", line 1978, in node
+      return self.index[rev][7]
+             ~~~~~~~~~~^^^^^
+  IndexError: revlog index out of range
+  [1]
 
   $ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f
-  repo2-1 at top
-  repo1-0
-  repo1-1
+  abort: unknown revision '4'
+  [10]
 
 files can be compared across repos
 
   $ hg -R union:repo1+repo2 diff -r$tip1 -rtip
-  diff -r 68c0685446a3 -r 2f0d178c469c f
-  --- a/f	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/f	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,4 @@
-  +repo2-1 at top
-   repo1-0
-   repo1-1
-  -repo1-2
-  +repo2-3
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: 
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/commands.py", line 2730, in diff
+      logcmdutil.diffordiffstat(
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/logcmdutil.py", line 181, in diffordiffstat
+      for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2802, in filechunkiter
+      s = nbytes and f.read(nbytes)
+                     ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2742, in read
+      for chunk in self.iter:
+                   ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2713, in splitbig
+      for chunk in chunks:
+                   ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/patch.py", line 2541, in diff
+      for fctx1, fctx2, hdr, hunks in diffhunks(
+                                      ^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/patch.py", line 2982, in trydiff
+      fctx1 = getfilectx(f1, ctx1)
+              ^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/patch.py", line 2599, in getfilectx
+      cache[f] = fctx.filelog()
+                 ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 888, in filelog
+      return self._filelog
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1766, in __get__
+      result = self.func(obj)
+               ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 806, in _filelog
+      return self._repo.file(self._path)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 279, in file
+      return unionfilelog(
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 221, in __init__
+      self._revlog = unionrevlog(
+                     ^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 82, in __init__
+      link = linkmapper(linkrev)
+             ^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 272, in _clrev
+      node = self.repo2.changelog.node(rev2)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/revlog.py", line 1978, in node
+      return self.index[rev][7]
+             ~~~~~~~~~~^^^^^
+  IndexError: revlog index out of range
+  [1]
 
 heads from both repos are found correctly
 
   $ hg -R union:repo1+repo2 heads --template '{rev}:{node|short}  {desc|firstline}\n'
-  5:2f0d178c469c  repo2-3
+  3:c337dba826e7  repo2-1
   2:68c0685446a3  repo1-2
 
 revsets works across repos
 
   $ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"
-  8a58db72e69d
+  abort: unknown revision '5'
+  [10]
 
 annotate works - an indication that linkrevs works
 
   $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
-  3: repo2-1 at top
-  0: repo1-0
-  1: repo1-1
-  5: repo2-3
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: 
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/commands.py", line 581, in annotate
+      if not opts.get(b'text') and fctx.isbinary():
+                                   ^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 955, in isbinary
+      return stringutil.binary(self.data())
+                               ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 1327, in data
+      return self._filelog.read(self._filenode)
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1766, in __get__
+      result = self.func(obj)
+               ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/context.py", line 806, in _filelog
+      return self._repo.file(self._path)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 279, in file
+      return unionfilelog(
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 221, in __init__
+      self._revlog = unionrevlog(
+                     ^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 82, in __init__
+      link = linkmapper(linkrev)
+             ^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 272, in _clrev
+      node = self.repo2.changelog.node(rev2)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/revlog.py", line 1978, in node
+      return self.index[rev][7]
+             ~~~~~~~~~~^^^^^
+  IndexError: revlog index out of range
+  [1]
 
 union repos can be cloned ... and clones works correctly
 
   $ hg clone -U union:repo1+repo2 repo3
   requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 6 changesets with 11 changes to 6 files (+1 heads)
-  new changesets f093fec0529b:2f0d178c469c (6 drafts)
+  ** unknown exception encountered, please report by visiting
+  ** https://mercurial-scm.org/wiki/BugTracker
+  ** Python 3.12.4 (main, Jul 15 2024, 12:17:32) [GCC 13.2.0]
+  ** Mercurial Distributed SCM (version 6.8)
+  ** Extensions loaded: 
+  Traceback (most recent call last):
+    File "/tmp/hgtests.qiewis6n/install/bin/hg", line 59, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 142, in run
+      status = dispatch(req)
+               ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 231, in dispatch
+      status = _rundispatch(req)
+               ^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 275, in _rundispatch
+      ret = _runcatch(req) or 0
+            ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 456, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 466, in _callcatch
+      return scmutil.callcatch(ui, func)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/scmutil.py", line 152, in callcatch
+      return func()
+             ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 446, in _runcatchfunc
+      return _dispatch(req)
+             ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1271, in _dispatch
+      return runcommand(
+             ^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 904, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1283, in _runcommand
+      return cmdfunc()
+             ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/dispatch.py", line 1269, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 1898, in check
+      return func(*args, **kwargs)
+             ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/commands.py", line 2035, in clone
+      r = hg.clone(
+          ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/hg.py", line 1016, in clone
+      exchange.pull(
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/exchange.py", line 1767, in pull
+      _fullpullbundle2(repo, pullop)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/exchange.py", line 1618, in _fullpullbundle2
+      _pullbundle2(pullop)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/exchange.py", line 1967, in _pullbundle2
+      bundle = e.callcommand(b'getbundle', args).result()
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/usr/lib/python3.12/concurrent/futures/_base.py", line 449, in result
+      return self.__get_result()
+             ^^^^^^^^^^^^^^^^^^^
+    File "/usr/lib/python3.12/concurrent/futures/_base.py", line 401, in __get_result
+      raise self._exception
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 288, in callcommand
+      result = fn(**pycompat.strkwargs(args))
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/localrepo.py", line 389, in getbundle
+      return bundle2.getunbundler(self.ui, cb)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 811, in getunbundler
+      magicstring = changegroup.readexactly(fp, 4)
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 3197, in readexactly
+      s = stream.read(n)
+          ^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2742, in read
+      for chunk in self.iter:
+                   ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2713, in splitbig
+      for chunk in chunks:
+                   ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 740, in getchunks
+      for chunk in self._compengine.compressstream(
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 763, in _getcorechunk
+      for chunk in part.getchunks(ui=self.ui):
+                   ^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 1222, in getchunks
+      pycompat.raisewithtb(exc, tb)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/pycompat.py", line 348, in raisewithtb
+      raise exc.with_traceback(tb)
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 1194, in getchunks
+      for chunk in self._payloadchunks():
+                   ^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/bundle2.py", line 1236, in _payloadchunks
+      chunk = buff.read(preferedchunksize)
+              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2742, in read
+      for chunk in self.iter:
+                   ^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/util.py", line 2713, in splitbig
+      for chunk in chunks:
+                   ^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/changegroup.py", line 1638, in generate
+      for path, deltas in it:
+                          ^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/changegroup.py", line 1986, in generatefiles
+      filerevlog = repo.file(fname)
+                   ^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 279, in file
+      return unionfilelog(
+             ^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 221, in __init__
+      self._revlog = unionrevlog(
+                     ^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 82, in __init__
+      link = linkmapper(linkrev)
+             ^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/unionrepo.py", line 272, in _clrev
+      node = self.repo2.changelog.node(rev2)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    File "/tmp/hgtests.qiewis6n/install/lib/python/mercurial/revlog.py", line 1978, in node
+      return self.index[rev][7]
+             ~~~~~~~~~~^^^^^
+  IndexError: revlog index out of range
+  [1]
 
   $ hg -R repo3 paths
-  default = union:repo1+repo2
+  abort: repository repo3 not found
+  [255]
 
   $ hg -R repo3 verify -q
+  abort: repository repo3 not found
+  [255]
 
   $ hg -R repo3 heads --template '{rev}:{node|short}  {desc|firstline}\n'
-  5:2f0d178c469c  repo2-3
-  2:68c0685446a3  repo1-2
+  abort: repository repo3 not found
+  [255]
 
   $ hg -R repo3 log --template '{rev}:{node|short}  {desc|firstline}\n'
-  5:2f0d178c469c  repo2-3
-  4:9e6fb3e0b9da  repo2-2-merge
-  3:c337dba826e7  repo2-1
-  2:68c0685446a3  repo1-2
-  1:8a58db72e69d  repo1-1
-  0:f093fec0529b  repo1-0
+  abort: repository repo3 not found
+  [255]
 
 union repos should use the correct rev number (issue5024)
 

ERROR: test-unionrepo.t output changed
!# Running sh "/tmp/hgtests.qiewis6n/child643/test-identify.t.sh" 
# Ret was: 0 (test-unionrepo.t) 
test-rebase-transaction.t#continueflag
test-rebase-transaction.t#continueflag ... # Test test-rebase-transaction.t#continueflag 
# Timout reached for process 1162136 
# Running sh "/tmp/hgtests.qiewis6n/child645/test-rebase-transaction.t-continueflag.sh" 
# Ret was: 0 (test-rebase-transaction.t#continuecommand) 
ok
test-narrow-pull.t
test-narrow-pull.t ... # Test test-narrow-pull.t 
# Running sh "/tmp/hgtests.qiewis6n/child646/test-narrow-pull.t.sh" 
# Timout reached for process 1162289 
# Timout reached for process 1162308 
# Ret was: 0 (test-rebase-transaction.t#continueflag) 
ok
test-mq-missingfiles.t
test-mq-missingfiles.t ... # Test test-mq-missingfiles.t 
# Running sh "/tmp/hgtests.qiewis6n/child647/test-mq-missingfiles.t.sh" 
# Killing daemon process 1162415 
# Timout reached for process 1162300 
# Daemon process 1162415 is stuck - really killing it 
# Ret was: 0 (test-identify.t) 
ok
test-convert-datesort.t
test-convert-datesort.t ... # Test test-convert-datesort.t 
# Running sh "/tmp/hgtests.qiewis6n/child648/test-convert-datesort.t.sh" 
# Timout reached for process 1162048 
# Ret was: 0 (test-mq-missingfiles.t) 
ok
test-mq-qdelete.t
test-mq-qdelete.t ... # Test test-mq-qdelete.t 
# Running sh "/tmp/hgtests.qiewis6n/child649/test-mq-qdelete.t.sh" 
# Timout reached for process 1162434 
# Ret was: 0 (test-narrow-clone-no-ellipsis.t) 
ok
test-logtoprocess.t
test-logtoprocess.t ... # Test test-logtoprocess.t 
# Running sh "/tmp/hgtests.qiewis6n/child650/test-logtoprocess.t.sh" 
# Ret was: 0 (test-logtoprocess.t) 
ok
test-clone-update-order.t
test-clone-update-order.t ... # Test test-clone-update-order.t 
# Running sh "/tmp/hgtests.qiewis6n/child651/test-clone-update-order.t.sh" 
# Timout reached for process 1162661 
# Timout reached for process 1162521 
# Ret was: 0 (test-convert-datesort.t) 
ok
test-pending.t
test-pending.t ... # Test test-pending.t 
# Running sh "/tmp/hgtests.qiewis6n/child652/test-pending.t.sh" 
# Ret was: 0 (test-clone-update-order.t) 
ok
test-pull-network.t
test-pull-network.t ... # Test test-pull-network.t 
# Timout reached for process 1162740 
# Ret was: 0 (test-narrow-pull.t) 
ok
test-fastannotate-perfhack.t
test-fastannotate-perfhack.t ... # Test test-fastannotate-perfhack.t 
# Running sh "/tmp/hgtests.qiewis6n/child654/test-fastannotate-perfhack.t.sh" 
# Timout reached for process 1162418 
# Running sh "/tmp/hgtests.qiewis6n/child653/test-pull-network.t.sh" 
# Ret was: 0 (test-pending.t) 
ok
test-origbackup-conflict.t
test-origbackup-conflict.t ... # Test test-origbackup-conflict.t 
# Timout reached for process 1162766 
# Running sh "/tmp/hgtests.qiewis6n/child655/test-origbackup-conflict.t.sh" 
# Ret was: 0 (test-mq-qdelete.t) 
ok
test-mq-merge.t
test-mq-merge.t ... # Test test-mq-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child656/test-mq-merge.t.sh" 
# Timout reached for process 1162637 
# Killing daemon process 1162913 
# Timout reached for process 1162890 
# Daemon process 1162913 is stuck - really killing it 
# Ret was: 0 (test-pull-network.t) 
ok
test-update-atomic.t
test-update-atomic.t ... # Test test-update-atomic.t 
# Running sh "/tmp/hgtests.qiewis6n/child657/test-update-atomic.t.sh" 
# Ret was: 0 (test-origbackup-conflict.t) 
ok
test-merge-local.t
test-merge-local.t ... # Test test-merge-local.t 
# Running sh "/tmp/hgtests.qiewis6n/child658/test-merge-local.t.sh" 
# Timout reached for process 1162927 
# Ret was: 0 (test-fastannotate-perfhack.t) 
ok
test-hooklib-changeset_obsoleted.t
test-hooklib-changeset_obsoleted.t ... # Test test-hooklib-changeset_obsoleted.t 
# Running sh "/tmp/hgtests.qiewis6n/child659/test-hooklib-changeset_obsoleted.t.sh" 
# Timout reached for process 1162877 
# Ret was: 0 (test-update-atomic.t) 
# Timout reached for process 1163039 
ok
test-filebranch.t
test-filebranch.t ... # Test test-filebranch.t 
# Running sh "/tmp/hgtests.qiewis6n/child660/test-filebranch.t.sh" 
# Ret was: 0 (test-hooklib-changeset_obsoleted.t) 
ok
test-remotefilelog-http.t
test-remotefilelog-http.t ... # Test test-remotefilelog-http.t 
# Timout reached for process 1163098 
# Running sh "/tmp/hgtests.qiewis6n/child661/test-remotefilelog-http.t.sh" 
# Ret was: 0 (test-merge-local.t) 
ok
test-repo-filters-tiptoe.t
test-repo-filters-tiptoe.t ... # Test test-repo-filters-tiptoe.t 
# Running sh "/tmp/hgtests.qiewis6n/child662/test-repo-filters-tiptoe.t.sh" 
# Timout reached for process 1163072 
# Ret was: 0 (test-filebranch.t) 
ok
test-merge-internal-tools-pattern.t
test-merge-internal-tools-pattern.t ... # Test test-merge-internal-tools-pattern.t 
# Running sh "/tmp/hgtests.qiewis6n/child663/test-merge-internal-tools-pattern.t.sh" 
# Timout reached for process 1163139 
# Ret was: 0 (test-mq-merge.t) 
ok
test-sqlitestore.t
test-sqlitestore.t ... # Test test-sqlitestore.t 
# Timout reached for process 1163012 
# Running sh "/tmp/hgtests.qiewis6n/child664/test-sqlitestore.t.sh" 
skipped missing feature: sqlite3 module and matching cli is available
# Ret was: 80 (test-sqlitestore.t) 
test-exchange-obsmarkers-case-D3.t
test-exchange-obsmarkers-case-D3.t ... # Test test-exchange-obsmarkers-case-D3.t 
# Running sh "/tmp/hgtests.qiewis6n/child665/test-exchange-obsmarkers-case-D3.t.sh" 
# Timout reached for process 1163320 
# Killing daemon process 1163208 
# Timout reached for process 1163192 
# Daemon process 1163208 is stuck - really killing it 
# Killing daemon process 1163345 
# Daemon process 1163345 is stuck - really killing it 
# Killing daemon process 1163367 
# Daemon process 1163367 is stuck - really killing it 
# Ret was: 0 (test-remotefilelog-http.t) 
ok
test-rebuildstate.t
test-rebuildstate.t ... # Test test-rebuildstate.t 
# Running sh "/tmp/hgtests.qiewis6n/child666/test-rebuildstate.t.sh" 
# Ret was: 0 (test-repo-filters-tiptoe.t) 
ok
test-bugzilla.t
test-bugzilla.t ... # Test test-bugzilla.t 
# Running sh "/tmp/hgtests.qiewis6n/child667/test-bugzilla.t.sh" 
# Timout reached for process 1163231 
# Ret was: 0 (test-bugzilla.t) 
ok
test-simple-update.t
test-simple-update.t ... # Test test-simple-update.t 
# Timout reached for process 1163419 
# Running sh "/tmp/hgtests.qiewis6n/child668/test-simple-update.t.sh" 
# Ret was: 0 (test-merge-internal-tools-pattern.t) 
ok
test-remotefilelog-sparse.t
test-remotefilelog-sparse.t ... # Test test-remotefilelog-sparse.t 
# Timout reached for process 1163261 
# Running sh "/tmp/hgtests.qiewis6n/child669/test-remotefilelog-sparse.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-D3.t) 
ok
test-remotefilelog-clone.t
test-remotefilelog-clone.t ... # Test test-remotefilelog-clone.t 
# Timout reached for process 1163324 
# Running sh "/tmp/hgtests.qiewis6n/child670/test-remotefilelog-clone.t.sh" 
# Ret was: 0 (test-rebuildstate.t) 
ok
test-remotefilelog-clone-tree.t
test-remotefilelog-clone-tree.t ... # Test test-remotefilelog-clone-tree.t 
# Timout reached for process 1163395 
# Running sh "/tmp/hgtests.qiewis6n/child671/test-remotefilelog-clone-tree.t.sh" 
# Ret was: 0 (test-simple-update.t) 
ok
test-rename-rev.t
test-rename-rev.t ... # Test test-rename-rev.t 
# Running sh "/tmp/hgtests.qiewis6n/child672/test-rename-rev.t.sh" 
# Timout reached for process 1163483 
# Timout reached for process 1163570 
# Timout reached for process 1163606 
# Ret was: 0 (test-remotefilelog-clone.t) 
ok
test-mac-packages.t
test-mac-packages.t ... # Test test-mac-packages.t 
# Running sh "/tmp/hgtests.qiewis6n/child673/test-mac-packages.t.sh" 
skipped missing feature: OS X packaging tools
# Ret was: 80 (test-mac-packages.t) 
test-branch-option.t
test-branch-option.t ... # Test test-branch-option.t 
# Running sh "/tmp/hgtests.qiewis6n/child674/test-branch-option.t.sh" 
# Timout reached for process 1163824 
# Ret was: 0 (test-remotefilelog-clone-tree.t) 
ok
test-empty-group.t
test-empty-group.t ... # Test test-empty-group.t 
# Running sh "/tmp/hgtests.qiewis6n/child675/test-empty-group.t.sh" 
# Timout reached for process 1163492 
# Ret was: 0 (test-remotefilelog-sparse.t) 
ok
test-narrow-shallow.t
test-narrow-shallow.t ... # Test test-narrow-shallow.t 
# Running sh "/tmp/hgtests.qiewis6n/child676/test-narrow-shallow.t.sh" 
# Ret was: 0 (test-empty-group.t) 
ok
test-parents.t
test-parents.t ... # Test test-parents.t 
# Running sh "/tmp/hgtests.qiewis6n/child677/test-parents.t.sh" 
# Timout reached for process 1163858 
# Ret was: 0 (test-rename-rev.t) 
ok
test-fix-metadata.t
test-fix-metadata.t ... # Test test-fix-metadata.t 
# Running sh "/tmp/hgtests.qiewis6n/child678/test-fix-metadata.t.sh" 
# Timout reached for process 1163743 
# Ret was: 0 (test-fix-metadata.t) 
ok
test-serve.t
test-serve.t ... # Test test-serve.t 
# Timout reached for process 1163999 
# Running sh "/tmp/hgtests.qiewis6n/child679/test-serve.t.sh" 
# Ret was: 0 (test-branch-option.t) 
ok
test-http-branchmap.t
test-http-branchmap.t ... # Test test-http-branchmap.t 
# Running sh "/tmp/hgtests.qiewis6n/child680/test-http-branchmap.t.sh" 
# Timout reached for process 1163830 
# Ret was: 0 (test-parents.t) 
ok
test-single-head-obsolescence-named-branch-A3.t
test-single-head-obsolescence-named-branch-A3.t ... # Test test-single-head-obsolescence-named-branch-A3.t 
# Running sh "/tmp/hgtests.qiewis6n/child681/test-single-head-obsolescence-named-branch-A3.t.sh" 
# Timout reached for process 1163969 
# Ret was: 0 (test-http-branchmap.t) 
ok
test-children.t
test-children.t ... # Test test-children.t 
# Running sh "/tmp/hgtests.qiewis6n/child682/test-children.t.sh" 
# Timout reached for process 1164071 
# Ret was: 0 (test-serve.t) 
ok
test-run-tests.py
test-run-tests.py ... # Test test-run-tests.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-run-tests.py" 
# Timout reached for process 1164037 
# Ret was: 0 (test-run-tests.py) 
ok
test-single-head-obsolescence-named-branch-A4.t
test-single-head-obsolescence-named-branch-A4.t ... # Test test-single-head-obsolescence-named-branch-A4.t 
# Running sh "/tmp/hgtests.qiewis6n/child684/test-single-head-obsolescence-named-branch-A4.t.sh" 
# Timout reached for process 1164201 
# Ret was: 0 (test-children.t) 
ok
test-extdata.t
test-extdata.t ... # Test test-extdata.t 
# Running sh "/tmp/hgtests.qiewis6n/child685/test-extdata.t.sh" 
# Timout reached for process 1164174 
# Ret was: 0 (test-single-head-obsolescence-named-branch-A3.t) 
ok
test-debugextensions.t
test-debugextensions.t ... # Test test-debugextensions.t 
# Timout reached for process 1164141 
# Running sh "/tmp/hgtests.qiewis6n/child686/test-debugextensions.t.sh" 

--- /<<PKGBUILDDIR>>/tests/test-narrow-shallow.t
+++ /<<PKGBUILDDIR>>/tests/test-narrow-shallow.t.err
@@ -23,6 +23,8 @@
   >   hg add "d2/f$x"
   > done
   $ hg commit -m "Add d1 and d2"
+  Bus error
+  [135]
   $ for x in `$TESTDIR/seq.py 10`
   > do
   >   echo f$x rev2 > "f$x"
@@ -30,6 +32,27 @@
   >   echo d2/f$x rev2 > "d2/f$x"
   >   hg commit -m "Commit rev2 of f$x, d1/f$x, d2/f$x"
   > done
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ cd ..
 
 narrow and shallow clone the d2 directory
@@ -39,21 +62,19 @@
   adding changesets
   adding manifests
   adding file changes
-  added 4 changesets with 13 changes to 10 files
-  new changesets *:* (glob)
+  added 1 changesets with 0 changes to 0 files
+  new changesets 5320f4a2b7c9
   updating to branch default
-  10 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd shallow
   $ hg log -T '{rev}{if(ellipsis,"...")}: {desc}\n'
-  3: Commit rev2 of f10, d1/f10, d2/f10
-  2: Commit rev2 of f9, d1/f9, d2/f9
-  1: Commit rev2 of f8, d1/f8, d2/f8
-  0...: Commit rev2 of f7, d1/f7, d2/f7
+  0...: Add root files
   $ hg update 0
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat d2/f7 d2/f8
-  d2/f7 rev2
-  d2/8
+  cat: d2/f7: $ENOENT$
+  cat: d2/f8: $ENOENT$
+  [1]
 
   $ cd ..
 
@@ -67,6 +88,27 @@
   >   echo d2/f$x rev3 > "d2/f$x"
   >   hg commit -m "Commit rev3 of f$x, d1/f$x, d2/f$x"
   > done
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  abort: abandoned transaction found
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ cd ..
 
 pull new changes with --depth specified. There were 10 changes to the d2
@@ -76,31 +118,23 @@
   $ hg pull --depth 2
   pulling from ssh://user@dummy/master
   searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 4 changesets with 10 changes to 10 files
-  new changesets *:* (glob)
-  (run 'hg update' to get a working copy)
+  no changes found
   $ hg log -T '{rev}{if(ellipsis,"...")}: {desc}\n'
-  7: Commit rev3 of f10, d1/f10, d2/f10
-  6: Commit rev3 of f9, d1/f9, d2/f9
-  5: Commit rev3 of f8, d1/f8, d2/f8
-  4...: Commit rev3 of f7, d1/f7, d2/f7
-  3: Commit rev2 of f10, d1/f10, d2/f10
-  2: Commit rev2 of f9, d1/f9, d2/f9
-  1: Commit rev2 of f8, d1/f8, d2/f8
-  0...: Commit rev2 of f7, d1/f7, d2/f7
+  0...: Add root files
 
   $ hg update 4
-  10 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: unknown revision '4'
+  [10]
   $ cat d2/f7 d2/f8
-  d2/f7 rev3
-  d2/f8 rev2
+  cat: d2/f7: $ENOENT$
+  cat: d2/f8: $ENOENT$
+  [1]
   $ hg update 7
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: unknown revision '7'
+  [10]
   $ cat d2/f10
-  d2/f10 rev3
+  cat: d2/f10: $ENOENT$
+  [1]
 
   $ cd ..
 

ERROR: test-narrow-shallow.t output changed
!# Ret was: 0 (test-narrow-shallow.t) 
test-narrow-commit.t#flat
test-narrow-commit.t#flat ... # Test test-narrow-commit.t#flat 
# Running sh "/tmp/hgtests.qiewis6n/child687/test-narrow-commit.t-flat.sh" 
# Timout reached for process 1163924 
# Ret was: 0 (test-single-head-obsolescence-named-branch-A4.t) 
ok
test-narrow-commit.t#tree
test-narrow-commit.t#tree ... # Test test-narrow-commit.t#tree 
# Timout reached for process 1164205 
# Running sh "/tmp/hgtests.qiewis6n/child688/test-narrow-commit.t-tree.sh" 
# Timout reached for process 1164331 
# Ret was: 0 (test-debugextensions.t) 
ok
test-issue672.t
test-issue672.t ... # Test test-issue672.t 
# Running sh "/tmp/hgtests.qiewis6n/child689/test-issue672.t.sh" 
# Ret was: 0 (test-issue672.t) 
ok
test-mq-pull-from-bundle.t
test-mq-pull-from-bundle.t ... # Test test-mq-pull-from-bundle.t 
# Timout reached for process 1164392 
# Running sh "/tmp/hgtests.qiewis6n/child690/test-mq-pull-from-bundle.t.sh" 
# Ret was: 0 (test-extdata.t) 
ok
test-exchange-obsmarkers-case-B3.t
test-exchange-obsmarkers-case-B3.t ... # Test test-exchange-obsmarkers-case-B3.t 
# Running sh "/tmp/hgtests.qiewis6n/child691/test-exchange-obsmarkers-case-B3.t.sh" 
# Timout reached for process 1164317 
# Timout reached for process 1164345 
# Ret was: 0 (test-narrow-commit.t#flat) 
ok
test-remotefilelog-corrupt-cache.t
test-remotefilelog-corrupt-cache.t ... # Test test-remotefilelog-corrupt-cache.t 
# Running sh "/tmp/hgtests.qiewis6n/child692/test-remotefilelog-corrupt-cache.t.sh" 
# Ret was: 0 (test-narrow-commit.t#tree) 
ok
test-revlog-v2.t
test-revlog-v2.t ... # Test test-revlog-v2.t 
# Timout reached for process 1164364 
# Running sh "/tmp/hgtests.qiewis6n/child693/test-revlog-v2.t.sh" 
# Ret was: 0 (test-mq-pull-from-bundle.t) 
ok
test-requires.t
test-requires.t ... # Test test-requires.t 
# Running sh "/tmp/hgtests.qiewis6n/child694/test-requires.t.sh" 
# Timout reached for process 1164487 
# Timout reached for process 1164577 
# Ret was: 0 (test-revlog-v2.t) 
ok
test-tools.t
test-tools.t ... # Test test-tools.t 
# Ret was: 0 (test-remotefilelog-corrupt-cache.t) 
ok
test-eol-clone.t
test-eol-clone.t ... # Test test-eol-clone.t 
# Running sh "/tmp/hgtests.qiewis6n/child696/test-eol-clone.t.sh" 
# Timout reached for process 1164561 
# Running sh "/tmp/hgtests.qiewis6n/child695/test-tools.t.sh" 
# Ret was: 0 (test-exchange-obsmarkers-case-B3.t) 
ok
test-extensions-afterloaded.t
test-extensions-afterloaded.t ... # Test test-extensions-afterloaded.t 
# Running sh "/tmp/hgtests.qiewis6n/child697/test-extensions-afterloaded.t.sh" 
# Timout reached for process 1164516 
# Timout reached for process 1164735 
# Ret was: 0 (test-tools.t) 
ok
test-lfs-bundle.t
test-lfs-bundle.t ... # Test test-lfs-bundle.t 
# Running sh "/tmp/hgtests.qiewis6n/child698/test-lfs-bundle.t.sh" 
# Timout reached for process 1164659 
# Timout reached for process 1164710 
# Ret was: 0 (test-requires.t) 
ok
test-wireproto-serverreactor.py
test-wireproto-serverreactor.py ... # Test test-wireproto-serverreactor.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-wireproto-serverreactor.py" 
# Ret was: 0 (test-eol-clone.t) 
ok
test-single-head-obsolescence-named-branch-A1.t
test-single-head-obsolescence-named-branch-A1.t ... # Test test-single-head-obsolescence-named-branch-A1.t 
# Running sh "/tmp/hgtests.qiewis6n/child700/test-single-head-obsolescence-named-branch-A1.t.sh" 
# Ret was: 0 (test-wireproto-serverreactor.py) 
ok
test-fastannotate-corrupt.t
test-fastannotate-corrupt.t ... # Test test-fastannotate-corrupt.t 
# Running sh "/tmp/hgtests.qiewis6n/child701/test-fastannotate-corrupt.t.sh" 
# Timout reached for process 1164913 
# Ret was: 0 (test-extensions-afterloaded.t) 
ok
test-single-head-obsolescence-named-branch-A2.t
test-single-head-obsolescence-named-branch-A2.t ... # Test test-single-head-obsolescence-named-branch-A2.t 
# Running sh "/tmp/hgtests.qiewis6n/child702/test-single-head-obsolescence-named-branch-A2.t.sh" 
# Timout reached for process 1164740 
# Timout reached for process 1164794 
# Ret was: 0 (test-lfs-bundle.t) 
ok
test-single-head-obsolescence-named-branch-A5.t
test-single-head-obsolescence-named-branch-A5.t ... # Test test-single-head-obsolescence-named-branch-A5.t 
# Running sh "/tmp/hgtests.qiewis6n/child703/test-single-head-obsolescence-named-branch-A5.t.sh" 
# Ret was: 0 (test-fastannotate-corrupt.t) 
ok
test-revlog.t
test-revlog.t ... # Test test-revlog.t 
# Running sh "/tmp/hgtests.qiewis6n/child704/test-revlog.t.sh" 
# Timout reached for process 1164933 
# Ret was: 0 (test-revlog.t) 
ok
test-relink.t
test-relink.t ... # Test test-relink.t 
# Timout reached for process 1165034 
# Ret was: 0 (test-single-head-obsolescence-named-branch-A1.t) 
ok
test-record.t
test-record.t ... # Test test-record.t 
# Running sh "/tmp/hgtests.qiewis6n/child706/test-record.t.sh" 
# Timout reached for process 1164918 
# Ret was: 0 (test-single-head-obsolescence-named-branch-A2.t) 
ok
test-contrib-pull-logger.t
test-contrib-pull-logger.t ... # Test test-contrib-pull-logger.t 
# Running sh "/tmp/hgtests.qiewis6n/child707/test-contrib-pull-logger.t.sh" 
# Timout reached for process 1164963 
# Running sh "/tmp/hgtests.qiewis6n/child705/test-relink.t.sh" 
# Ret was: 0 (test-record.t) 
ok
test-mq-qqueue.t
test-mq-qqueue.t ... # Test test-mq-qqueue.t 
# Running sh "/tmp/hgtests.qiewis6n/child708/test-mq-qqueue.t.sh" 
# Timout reached for process 1165100 
# Timout reached for process 1165015 
# Ret was: 0 (test-single-head-obsolescence-named-branch-A5.t) 
ok
test-remotefilelog-log.t
test-remotefilelog-log.t ... # Test test-remotefilelog-log.t 
# Running sh "/tmp/hgtests.qiewis6n/child709/test-remotefilelog-log.t.sh" 
# Ret was: 0 (test-relink.t) 
ok
test-narrow-rebase.t#continuecommand
test-narrow-rebase.t#continuecommand ... # Timout reached for process 1165111 
# Test test-narrow-rebase.t#continuecommand 
# Running sh "/tmp/hgtests.qiewis6n/child710/test-narrow-rebase.t-continuecommand.sh" 
# Timout reached for process 1165173 
# Ret was: 0 (test-remotefilelog-log.t) 
ok
test-narrow-rebase.t#continueflag
test-narrow-rebase.t#continueflag ... # Test test-narrow-rebase.t#continueflag 
# Running sh "/tmp/hgtests.qiewis6n/child711/test-narrow-rebase.t-continueflag.sh" 
# Timout reached for process 1165204 
# Ret was: 0 (test-narrow-rebase.t#continuecommand) 
ok
test-transaction-rollback-on-sigpipe.t
test-transaction-rollback-on-sigpipe.t ... # Test test-transaction-rollback-on-sigpipe.t 
# Running sh "/tmp/hgtests.qiewis6n/child712/test-transaction-rollback-on-sigpipe.t.sh" 
# Ret was: 0 (test-mq-qqueue.t) 
ok
test-bundle2-pushback.t
test-bundle2-pushback.t ... # Test test-bundle2-pushback.t 
# Running sh "/tmp/hgtests.qiewis6n/child713/test-bundle2-pushback.t.sh" 
# Timout reached for process 1165144 
# Timout reached for process 1165413 
# Ret was: 0 (test-transaction-rollback-on-sigpipe.t) 
ok
test-push-cgi.t
test-push-cgi.t ... # Test test-push-cgi.t 
# Running sh "/tmp/hgtests.qiewis6n/child714/test-push-cgi.t.sh" 
# Ret was: 0 (test-push-cgi.t) 
ok
test-hgweb-non-interactive.t
test-hgweb-non-interactive.t ... # Test test-hgweb-non-interactive.t 
# Running sh "/tmp/hgtests.qiewis6n/child715/test-hgweb-non-interactive.t.sh" 
# Timout reached for process 1165518 
# Ret was: 0 (test-bundle2-pushback.t) 
ok
test-excessive-merge.t
test-excessive-merge.t ... # Test test-excessive-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child716/test-excessive-merge.t.sh" 
# Timout reached for process 1165456 
# Ret was: 0 (test-hgweb-non-interactive.t) 
ok
test-rebase-backup.t
test-rebase-backup.t ... # Test test-rebase-backup.t 
# Running sh "/tmp/hgtests.qiewis6n/child717/test-rebase-backup.t.sh" 
# Timout reached for process 1165576 
# Ret was: 0 (test-narrow-rebase.t#continueflag) 
ok
test-patch.t
test-patch.t ... # Test test-patch.t 
# Running sh "/tmp/hgtests.qiewis6n/child718/test-patch.t.sh" 
# Timout reached for process 1165384 
# Ret was: 0 (test-excessive-merge.t) 
ok
test-cache-abuse.t
test-cache-abuse.t ... # Test test-cache-abuse.t 
# Running sh "/tmp/hgtests.qiewis6n/child719/test-cache-abuse.t.sh" 
# Timout reached for process 1165598 
# Ret was: 0 (test-patch.t) 
ok
test-rhg-sparse-narrow.t
test-rhg-sparse-narrow.t ... # Test test-rhg-sparse-narrow.t 
# Timout reached for process 1165635 
# Running sh "/tmp/hgtests.qiewis6n/child720/test-rhg-sparse-narrow.t.sh" 
skipped missing feature: running with rhg as 'hg'
# Ret was: 80 (test-rhg-sparse-narrow.t) 
test-arbitraryfilectx.t
test-arbitraryfilectx.t ... # Test test-arbitraryfilectx.t 
# Timout reached for process 1165741 
# Running sh "/tmp/hgtests.qiewis6n/child721/test-arbitraryfilectx.t.sh" 
# Ret was: 0 (test-rebase-backup.t) 
ok
test-pathconflicts-basic.t
test-pathconflicts-basic.t ... # Test test-pathconflicts-basic.t 
# Running sh "/tmp/hgtests.qiewis6n/child722/test-pathconflicts-basic.t.sh" 
# Timout reached for process 1165605 
# Ret was: 0 (test-arbitraryfilectx.t) 
ok
test-hgweb-head.t
test-hgweb-head.t ... # Test test-hgweb-head.t 
# Timout reached for process 1165749 
# Running sh "/tmp/hgtests.qiewis6n/child723/test-hgweb-head.t.sh" 
# Ret was: 0 (test-hgweb-head.t) 
ok
test-hooklib-changeset_published.t
test-hooklib-changeset_published.t ... # Test test-hooklib-changeset_published.t 
# Running sh "/tmp/hgtests.qiewis6n/child724/test-hooklib-changeset_published.t.sh" 
# Timout reached for process 1166038 
# Timout reached for process 1165107 
# Ret was: 0 (test-contrib-pull-logger.t) 
ok
test-committer.t
test-committer.t ... # Test test-committer.t 
# Running sh "/tmp/hgtests.qiewis6n/child725/test-committer.t.sh" 
# Ret was: 0 (test-pathconflicts-basic.t) 
ok
test-exchange-obsmarkers-case-B7.t
test-exchange-obsmarkers-case-B7.t ... # Test test-exchange-obsmarkers-case-B7.t 
# Running sh "/tmp/hgtests.qiewis6n/child726/test-exchange-obsmarkers-case-B7.t.sh" 
# Timout reached for process 1165773 
# Ret was: 0 (test-hooklib-changeset_published.t) 
ok
test-server-view.t
test-server-view.t ... # Test test-server-view.t 
# Running sh "/tmp/hgtests.qiewis6n/child727/test-server-view.t.sh" 
# Timout reached for process 1166181 
# Ret was: 0 (test-committer.t) 
ok
test-pull-http.t
test-pull-http.t ... # Test test-pull-http.t 
# Timout reached for process 1166241 
# Running sh "/tmp/hgtests.qiewis6n/child728/test-pull-http.t.sh" 
# Ret was: 0 (test-server-view.t) 
ok
test-remotefilelog-bundle2-legacy.t
test-remotefilelog-bundle2-legacy.t ... # Test test-remotefilelog-bundle2-legacy.t 
# Timout reached for process 1166273 
# Running sh "/tmp/hgtests.qiewis6n/child729/test-remotefilelog-bundle2-legacy.t.sh" 
skipped skipped
# Ret was: 80 (test-remotefilelog-bundle2-legacy.t) 
test-exchange-obsmarkers-case-B1.t
test-exchange-obsmarkers-case-B1.t ... # Test test-exchange-obsmarkers-case-B1.t 
# Running sh "/tmp/hgtests.qiewis6n/child730/test-exchange-obsmarkers-case-B1.t.sh" 
# Timout reached for process 1166465 
# Ret was: 0 (test-exchange-obsmarkers-case-B7.t) 
ok
test-bookmarks-rebase.t
test-bookmarks-rebase.t ... # Test test-bookmarks-rebase.t 
# Running sh "/tmp/hgtests.qiewis6n/child731/test-bookmarks-rebase.t.sh" 
# Timout reached for process 1166246 
# Ret was: 0 (test-cache-abuse.t) 
ok
test-rename-after-merge.t
test-rename-after-merge.t ... # Test test-rename-after-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child732/test-rename-after-merge.t.sh" 
# Timout reached for process 1165717 
# Ret was: 0 (test-pull-http.t) 
ok
test-remotefilelog-bundles.t
test-remotefilelog-bundles.t ... # Test test-remotefilelog-bundles.t 
# Timout reached for process 1166405 
# Running sh "/tmp/hgtests.qiewis6n/child733/test-remotefilelog-bundles.t.sh" 
# Ret was: 0 (test-bookmarks-rebase.t) 
ok
test-mq-qdiff.t
test-mq-qdiff.t ... # Test test-mq-qdiff.t 
# Running sh "/tmp/hgtests.qiewis6n/child734/test-mq-qdiff.t.sh" 
# Timout reached for process 1166503 
# Ret was: 0 (test-remotefilelog-bundles.t) 
ok
test-remotefilelog-bundle2.t
test-remotefilelog-bundle2.t ... # Test test-remotefilelog-bundle2.t 
# Timout reached for process 1166546 
# Running sh "/tmp/hgtests.qiewis6n/child735/test-remotefilelog-bundle2.t.sh" 
# Timout reached for process 1166489 
# Ret was: 0 (test-exchange-obsmarkers-case-B1.t) 
ok
test-exchange-obsmarkers-case-A7.t
test-exchange-obsmarkers-case-A7.t ... # Test test-exchange-obsmarkers-case-A7.t 
# Running sh "/tmp/hgtests.qiewis6n/child736/test-exchange-obsmarkers-case-A7.t.sh" 
# Ret was: 0 (test-rename-after-merge.t) 
ok
test-revset-outgoing.t
test-revset-outgoing.t ... # Test test-revset-outgoing.t 
# Running sh "/tmp/hgtests.qiewis6n/child737/test-revset-outgoing.t.sh" 
# Timout reached for process 1166511 
# Ret was: 0 (test-revset-outgoing.t) 
ok
test-nointerrupt.t
test-nointerrupt.t ... # Test test-nointerrupt.t 
# Timout reached for process 1166687 
# Running sh "/tmp/hgtests.qiewis6n/child738/test-nointerrupt.t.sh" 
# Ret was: 0 (test-mq-qdiff.t) 
ok
test-import-context.t
test-import-context.t ... # Test test-import-context.t 
# Running sh "/tmp/hgtests.qiewis6n/child739/test-import-context.t.sh" 
# Timout reached for process 1166637 
# Ret was: 0 (test-nointerrupt.t) 
ok
test-eol-add.t
test-eol-add.t ... # Test test-eol-add.t 
# Running sh "/tmp/hgtests.qiewis6n/child740/test-eol-add.t.sh" 
# Timout reached for process 1166807 
# Ret was: 0 (test-exchange-obsmarkers-case-A7.t) 
ok
test-bundle-vs-outgoing.t
test-bundle-vs-outgoing.t# Timout reached for process 1166677 
 ... # Test test-bundle-vs-outgoing.t 
# Running sh "/tmp/hgtests.qiewis6n/child741/test-bundle-vs-outgoing.t.sh" 
# Ret was: 0 (test-remotefilelog-bundle2.t) 
ok
test-rebase-partial.t
test-rebase-partial.t ... # Test test-rebase-partial.t 
# Running sh "/tmp/hgtests.qiewis6n/child742/test-rebase-partial.t.sh" 
# Timout reached for process 1166663 
# Ret was: 0 (test-import-context.t) 
ok
test-update-names.t
test-update-names.t ... # Test test-update-names.t 
# Timout reached for process 1166841 
# Running sh "/tmp/hgtests.qiewis6n/child743/test-update-names.t.sh" 
# Ret was: 0 (test-eol-add.t) 
ok
test-narrow-clone-stream.t#flat-fncache
test-narrow-clone-stream.t#flat-fncache ... # Test test-narrow-clone-stream.t#flat-fncache 
# Running sh "/tmp/hgtests.qiewis6n/child744/test-narrow-clone-stream.t-flat-fncache.sh" 
# Timout reached for process 1166915 
# Timout reached for process 1166944 
# Ret was: 0 (test-rebase-partial.t) 
ok
test-narrow-clone-stream.t#flat-nofncache
test-narrow-clone-stream.t#flat-nofncache ... # Test test-narrow-clone-stream.t#flat-nofncache 
# Ret was: 0 (test-bundle-vs-outgoing.t) 
ok
test-narrow-clone-stream.t#tree
test-narrow-clone-stream.t#tree ... # Test test-narrow-clone-stream.t#tree 
# Timout reached for process 1166935 
# Running sh "/tmp/hgtests.qiewis6n/child745/test-narrow-clone-stream.t-flat-nofncache.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child746/test-narrow-clone-stream.t-tree.sh" 
# Timout reached for process 1166971 
# Ret was: 0 (test-update-names.t) 
ok
test-hooklib-reject_merge_commits.t
test-hooklib-reject_merge_commits.t ... # Test test-hooklib-reject_merge_commits.t 
# Running sh "/tmp/hgtests.qiewis6n/child747/test-hooklib-reject_merge_commits.t.sh" 
# Ret was: 0 (test-hooklib-reject_merge_commits.t) 
ok
test-mailmap.t
test-mailmap.t ... # Test test-mailmap.t 
# Running sh "/tmp/hgtests.qiewis6n/child748/test-mailmap.t.sh" 
# Timout reached for process 1167132 
# Ret was: 0 (test-mailmap.t) 
ok
test-rebase-dry-run.t
test-rebase-dry-run.t ... # Test test-rebase-dry-run.t 
# Running sh "/tmp/hgtests.qiewis6n/child749/test-rebase-dry-run.t.sh" 
# Timout reached for process 1167166 
# Ret was: 0 (test-rebase-dry-run.t) 
# Timout reached for process 1167240 
ok
test-rank.t
test-rank.t ... # Test test-rank.t 
# Running sh "/tmp/hgtests.qiewis6n/child750/test-rank.t.sh" 
# Timout reached for process 1167328 
# Ret was: 0 (test-rank.t) 
ok
test-merge-remove.t
test-merge-remove.t ... # Test test-merge-remove.t 
# Running sh "/tmp/hgtests.qiewis6n/child751/test-merge-remove.t.sh" 
# Timout reached for process 1167013 
# Ret was: 0 (test-narrow-clone-stream.t#flat-fncache) 
ok
test-convert-tagsbranch-topology.t
test-convert-tagsbranch-topology.t ... # Test test-convert-tagsbranch-topology.t 
# Running sh "/tmp/hgtests.qiewis6n/child752/test-convert-tagsbranch-topology.t.sh" 
skipped missing feature: git command line client
# Ret was: 80 (test-convert-tagsbranch-topology.t) 
test-locate.t
test-locate.t ... # Test test-locate.t 
# Running sh "/tmp/hgtests.qiewis6n/child753/test-locate.t.sh" 
# Timout reached for process 1167512 
# Timout reached for process 1167065 
# Timout reached for process 1167068 
# Ret was: 0 (test-merge-remove.t) 
ok
test-merge-closedheads.t
test-merge-closedheads.t ... # Test test-merge-closedheads.t 
# Running sh "/tmp/hgtests.qiewis6n/child754/test-merge-closedheads.t.sh" 
# Timout reached for process 1167389 
# Ret was: 0 (test-narrow-clone-stream.t#flat-nofncache) 
ok
test-wireproto-clientreactor.py
test-wireproto-clientreactor.py ... # Test test-wireproto-clientreactor.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-wireproto-clientreactor.py" 
# Ret was: 0 (test-narrow-clone-stream.t#tree) 
ok
test-issue660.t#dirstate-v1
test-issue660.t#dirstate-v1 ... # Test test-issue660.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child756/test-issue660.t-dirstate-v1.sh" 
# Ret was: 0 (test-wireproto-clientreactor.py) 
ok
test-issue660.t#dirstate-v2
test-issue660.t#dirstate-v2 ... # Test test-issue660.t#dirstate-v2 
# Timout reached for process 1167588 
# Running sh "/tmp/hgtests.qiewis6n/child757/test-issue660.t-dirstate-v2.sh" 
# Ret was: 0 (test-issue660.t#dirstate-v1) 
ok
test-unified-test.t
test-unified-test.t ... # Test test-unified-test.t 
# Timout reached for process 1167595 
# Timout reached for process 1167516 
# Ret was: 0 (test-locate.t) 
ok
test-remotefilelog-pull-noshallow.t
test-remotefilelog-pull-noshallow.t ... # Test test-remotefilelog-pull-noshallow.t 
# Running sh "/tmp/hgtests.qiewis6n/child759/test-remotefilelog-pull-noshallow.t.sh" 
# Ret was: 0 (test-issue660.t#dirstate-v2) 
ok
test-remotefilelog-tags.t
test-remotefilelog-tags.t ... # Test test-remotefilelog-tags.t 
# Timout reached for process 1167607 
# Running sh "/tmp/hgtests.qiewis6n/child760/test-remotefilelog-tags.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child758/test-unified-test.t.sh" 
# Ret was: 0 (test-merge-closedheads.t) 
ok
test-issue1306.t
test-issue1306.t ... # Test test-issue1306.t 
# Running sh "/tmp/hgtests.qiewis6n/child761/test-issue1306.t.sh" 
# Timout reached for process 1167560 
# Ret was: 0 (test-unified-test.t) 
ok
test-cat.t
test-cat.t ... # Test test-cat.t 
# Running sh "/tmp/hgtests.qiewis6n/child762/test-cat.t.sh" 
# Timout reached for process 1167814 
# Ret was: 0 (test-remotefilelog-pull-noshallow.t) 
ok
test-narrow-sparse.t#flat
test-narrow-sparse.t#flat ... # Test test-narrow-sparse.t#flat 
# Timout reached for process 1167789 
# Ret was: 0 (test-issue1306.t) 
ok
test-narrow-sparse.t#tree
test-narrow-sparse.t#tree ... # Test test-narrow-sparse.t#tree 
# Timout reached for process 1167827 
# Running sh "/tmp/hgtests.qiewis6n/child763/test-narrow-sparse.t-flat.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child764/test-narrow-sparse.t-tree.sh" 
# Timout reached for process 1167803 
# Ret was: 0 (test-remotefilelog-tags.t) 
ok
test-debug-revlog-stats.t
test-debug-revlog-stats.t ... # Test test-debug-revlog-stats.t 
# Running sh "/tmp/hgtests.qiewis6n/child765/test-debug-revlog-stats.t.sh" 
# Timout reached for process 1167964 
# Timout reached for process 1168011 
# Ret was: 0 (test-debug-revlog-stats.t) 
ok
test-fuzz-targets.t
test-fuzz-targets.t ... # Test test-fuzz-targets.t 
# Running sh "/tmp/hgtests.qiewis6n/child766/test-fuzz-targets.t.sh" 
skipped missing feature: running tests from repository
# Ret was: 80 (test-fuzz-targets.t) 
test-histedit-merge-tools.t
test-histedit-merge-tools.t ... # Test test-histedit-merge-tools.t 
# Running sh "/tmp/hgtests.qiewis6n/child767/test-histedit-merge-tools.t.sh" 
# Timout reached for process 1168097 
# Ret was: 0 (test-narrow-sparse.t#tree) 
ok
test-histedit-no-backup.t#abortcommand
test-histedit-no-backup.t#abortcommand ... # Test test-histedit-no-backup.t#abortcommand 
# Running sh "/tmp/hgtests.qiewis6n/child768/test-histedit-no-backup.t-abortcommand.sh" 
# Timout reached for process 1167957 
# Ret was: 0 (test-cat.t) 
ok
test-histedit-no-backup.t#abortflag
test-histedit-no-backup.t#abortflag ... # Test test-histedit-no-backup.t#abortflag 
# Timout reached for process 1167858 
# Ret was: 0 (test-narrow-sparse.t#flat) 
ok
test-largefiles-small-disk.t
test-largefiles-small-disk.t ... # Test test-largefiles-small-disk.t 
# Running sh "/tmp/hgtests.qiewis6n/child770/test-largefiles-small-disk.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child769/test-histedit-no-backup.t-abortflag.sh" 
# Ret was: 0 (test-largefiles-small-disk.t) 
ok
test-narrow-clone-non-narrow-server.t
test-narrow-clone-non-narrow-server.t ... # Test test-narrow-clone-non-narrow-server.t 
# Running sh "/tmp/hgtests.qiewis6n/child771/test-narrow-clone-non-narrow-server.t.sh" 
# Timout reached for process 1168150 
# Ret was: 0 (test-histedit-no-backup.t#abortcommand) 
ok
test-issue586.t
test-issue586.t ... # Test test-issue586.t 
# Running sh "/tmp/hgtests.qiewis6n/child772/test-issue586.t.sh" 
# Timout reached for process 1168110 
# Ret was: 0 (test-histedit-merge-tools.t) 
ok
test-convert-clonebranches.t
test-convert-clonebranches.t ... # Test test-convert-clonebranches.t 
# Running sh "/tmp/hgtests.qiewis6n/child773/test-convert-clonebranches.t.sh" 
# Timout reached for process 1168101 
# Ret was: 0 (test-histedit-no-backup.t#abortflag) 
ok
test-remotefilelog-strip.t
test-remotefilelog-strip.t ... # Test test-remotefilelog-strip.t 
# Timout reached for process 1168164 
# Running sh "/tmp/hgtests.qiewis6n/child774/test-remotefilelog-strip.t.sh" 
# Ret was: 0 (test-remotefilelog-strip.t) 
ok
test-oldcgi.t
test-oldcgi.t ... # Test test-oldcgi.t 
# Timout reached for process 1168255 
# Running sh "/tmp/hgtests.qiewis6n/child775/test-oldcgi.t.sh" 
# Ret was: 0 (test-issue586.t) 
ok
test-impexp-branch.t
test-impexp-branch.t ... # Test test-impexp-branch.t 
# Running sh "/tmp/hgtests.qiewis6n/child776/test-impexp-branch.t.sh" 
# Timout reached for process 1168220 
# Ret was: 0 (test-convert-clonebranches.t) 
ok
test-rebase-legacy.t#continuecommand
test-rebase-legacy.t#continuecommand ... # Test test-rebase-legacy.t#continuecommand 
# Timout reached for process 1168238 
# Running sh "/tmp/hgtests.qiewis6n/child777/test-rebase-legacy.t-continuecommand.sh" 
# Ret was: 0 (test-oldcgi.t) 
ok
test-rebase-legacy.t#continueflag
test-rebase-legacy.t#continueflag ... # Test test-rebase-legacy.t#continueflag 
# Timout reached for process 1168341 
# Running sh "/tmp/hgtests.qiewis6n/child778/test-rebase-legacy.t-continueflag.sh" 
# Killing daemon process 1168339 
# Timout reached for process 1168212 
# Daemon process 1168339 is stuck - really killing it 
# Killing daemon process 1168362 
# Daemon process 1168362 is stuck - really killing it 
# Ret was: 0 (test-narrow-clone-non-narrow-server.t) 
ok
test-contrib-dumprevlog.t
test-contrib-dumprevlog.t ... # Test test-contrib-dumprevlog.t 
# Running sh "/tmp/hgtests.qiewis6n/child779/test-contrib-dumprevlog.t.sh" 
# Ret was: 0 (test-impexp-branch.t) 
ok
test-symlink-placeholder.t
test-symlink-placeholder.t ... # Test test-symlink-placeholder.t 
# Timout reached for process 1168349 
# Ret was: 0 (test-rebase-legacy.t#continuecommand) 
ok
test-strip-branch-cache.t
test-strip-branch-cache.t ... # Test test-strip-branch-cache.t 
# Running sh "/tmp/hgtests.qiewis6n/child781/test-strip-branch-cache.t.sh" 
# Timout reached for process 1168379 
# Running sh "/tmp/hgtests.qiewis6n/child780/test-symlink-placeholder.t.sh" 
# Ret was: 0 (test-rebase-legacy.t#continueflag) 
ok
test-issue1175.t
test-issue1175.t ... # Test test-issue1175.t 
# Running sh "/tmp/hgtests.qiewis6n/child782/test-issue1175.t.sh" 
# Timout reached for process 1168399 
# Ret was: 0 (test-contrib-dumprevlog.t) 
ok
test-merge6.t
test-merge6.t ... # Test test-merge6.t 
# Running sh "/tmp/hgtests.qiewis6n/child783/test-merge6.t.sh" 
# Timout reached for process 1168429 
# Ret was: 0 (test-strip-branch-cache.t) 
ok
test-narrow-copies.t
test-narrow-copies.t ... # Test test-narrow-copies.t 
# Running sh "/tmp/hgtests.qiewis6n/child784/test-narrow-copies.t.sh" 
# Timout reached for process 1168480 
# Ret was: 0 (test-symlink-placeholder.t) 
ok
test-url-download.t
test-url-download.t ... # Test test-url-download.t 
# Timout reached for process 1168484 
# Running sh "/tmp/hgtests.qiewis6n/child785/test-url-download.t.sh" 
# Ret was: 0 (test-merge6.t) 
ok
test-rebase-issue-noparam-single-rev.t
test-rebase-issue-noparam-single-rev.t ... # Test test-rebase-issue-noparam-single-rev.t 
# Running sh "/tmp/hgtests.qiewis6n/child786/test-rebase-issue-noparam-single-rev.t.sh" 
# Timout reached for process 1168515 
# Ret was: 0 (test-issue1175.t) 
ok
test-verify-repo-operations.py
test-verify-repo-operations.py ... # Test test-verify-repo-operations.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-verify-repo-operations.py" 
# Timout reached for process 1168496 
skipped missing feature: allow slow tests (use --allow-slow-tests)
# Ret was: 80 (test-verify-repo-operations.py) 
test-merge-revert2.t
test-merge-revert2.t ... # Test test-merge-revert2.t 
# Running sh "/tmp/hgtests.qiewis6n/child788/test-merge-revert2.t.sh" 
# Timout reached for process 1168657 
# Killing daemon process 1168639 
# Timout reached for process 1168582 
# Daemon process 1168639 is stuck - really killing it 
# Ret was: 0 (test-url-download.t) 
ok
test-wsgirequest.py
test-wsgirequest.py ... # Test test-wsgirequest.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-wsgirequest.py" 
# Ret was: 0 (test-wsgirequest.py) 
ok
test-ssh-repoerror.t
test-ssh-repoerror.t ... # Test test-ssh-repoerror.t 
# Timout reached for process 1168686 
# Running sh "/tmp/hgtests.qiewis6n/child790/test-ssh-repoerror.t.sh" 
# Ret was: 0 (test-narrow-copies.t) 
ok
test-close-head.t
test-close-head.t ... # Test test-close-head.t 
# Running sh "/tmp/hgtests.qiewis6n/child791/test-close-head.t.sh" 
# Timout reached for process 1168568 
# Timout reached for process 1168633 
# Ret was: 0 (test-rebase-issue-noparam-single-rev.t) 
ok
test-merge4.t
test-merge4.t ... # Test test-merge4.t 
# Running sh "/tmp/hgtests.qiewis6n/child792/test-merge4.t.sh" 
# Ret was: 0 (test-ssh-repoerror.t) 
ok
test-narrow-acl.t
test-narrow-acl.t ... # Test test-narrow-acl.t 
# Running sh "/tmp/hgtests.qiewis6n/child793/test-narrow-acl.t.sh" 
# Timout reached for process 1168699 
# Ret was: 0 (test-close-head.t) 
ok
test-addremove.t
test-addremove.t ... # Test test-addremove.t 
# Running sh "/tmp/hgtests.qiewis6n/child794/test-addremove.t.sh" 
# Timout reached for process 1168727 
# Ret was: 0 (test-merge-revert2.t) 
ok
test-mq-qrename.t
test-mq-qrename.t ... # Test test-mq-qrename.t 
# Running sh "/tmp/hgtests.qiewis6n/child795/test-mq-qrename.t.sh" 
# Timout reached for process 1168666 
# Ret was: 0 (test-merge4.t) 
ok
test-remotefilelog-partial-shallow.t
test-remotefilelog-partial-shallow.t ... # Test test-remotefilelog-partial-shallow.t 
# Timout reached for process 1168793 
# Running sh "/tmp/hgtests.qiewis6n/child796/test-remotefilelog-partial-shallow.t.sh" 
# Killing daemon process 1168866 
# Timout reached for process 1168821 
# Daemon process 1168866 is stuck - really killing it 
# Ret was: 0 (test-narrow-acl.t) 
ok
test-narrow-update.t
test-narrow-update.t ... # Test test-narrow-update.t 
# Running sh "/tmp/hgtests.qiewis6n/child797/test-narrow-update.t.sh" 
# Timout reached for process 1168855 
# Ret was: 0 (test-addremove.t) 
ok
test-mq-symlinks.t
test-mq-symlinks.t ... # Test test-mq-symlinks.t 
# Running sh "/tmp/hgtests.qiewis6n/child798/test-mq-symlinks.t.sh" 
# Timout reached for process 1168928 
# Ret was: 0 (test-remotefilelog-partial-shallow.t) 
ok
test-double-merge.t
test-double-merge.t ... # Test test-double-merge.t 
# Running sh "/tmp/hgtests.qiewis6n/child799/test-double-merge.t.sh" 
# Ret was: 0 (test-narrow-update.t) 
ok
test-narrow-patch.t#flat
test-narrow-patch.t#flat ... # Test test-narrow-patch.t#flat 
# Running sh "/tmp/hgtests.qiewis6n/child800/test-narrow-patch.t-flat.sh" 
# Timout reached for process 1168953 
# Ret was: 0 (test-double-merge.t) 
ok
test-narrow-patch.t#tree
test-narrow-patch.t#tree ... # Test test-narrow-patch.t#tree 
# Timout reached for process 1169065 
# Running sh "/tmp/hgtests.qiewis6n/child801/test-narrow-patch.t-tree.sh" 
# Timout reached for process 1168879 
# Ret was: 0 (test-mq-qrename.t) 
ok
test-glog-topological.t
test-glog-topological.t ... # Test test-glog-topological.t 
# Running sh "/tmp/hgtests.qiewis6n/child802/test-glog-topological.t.sh" 
# Ret was: 0 (test-narrow-patch.t#flat) 
ok
test-sparse-verbose-json.t
test-sparse-verbose-json.t ... # Test test-sparse-verbose-json.t 
# Running sh "/tmp/hgtests.qiewis6n/child803/test-sparse-verbose-json.t.sh" 
# Timout reached for process 1169109 
# Ret was: 0 (test-narrow-patch.t#tree) 
ok
test-narrow-acl-excludes.t
test-narrow-acl-excludes.t ... # Test test-narrow-acl-excludes.t 
# Running sh "/tmp/hgtests.qiewis6n/child804/test-narrow-acl-excludes.t.sh" 
# Timout reached for process 1169126 
# Ret was: 0 (test-glog-topological.t) 
ok
test-merge9.t
test-merge9.t ... # Test test-merge9.t 
# Running sh "/tmp/hgtests.qiewis6n/child805/test-merge9.t.sh" 
# Timout reached for process 1169172 
# Ret was: 0 (test-mq-symlinks.t) 
ok
test-update-reverse.t
test-update-reverse.t ... # Test test-update-reverse.t 
# Running sh "/tmp/hgtests.qiewis6n/child806/test-update-reverse.t.sh" 
# Timout reached for process 1169028 
# Ret was: 0 (test-sparse-verbose-json.t) 
ok
test-patch-offset.t
test-patch-offset.t ... # Test test-patch-offset.t 
# Running sh "/tmp/hgtests.qiewis6n/child807/test-patch-offset.t.sh" 
# Timout reached for process 1169187 

--- /<<PKGBUILDDIR>>/tests/test-patch-offset.t
+++ /<<PKGBUILDDIR>>/tests/test-patch-offset.t.err
@@ -63,16 +63,8 @@
   >  A
   >  A
   > EOF
-  applying patch from stdin
-  patching file a
-  Hunk #1 succeeded at 43 (offset 34 lines).
-  Hunk #2 succeeded at 87 (offset 34 lines).
-  Hunk #3 succeeded at 109 (offset 34 lines).
-  committing files:
-  a
-  committing manifest
-  committing changelog
-  created 189885cecb41
+  Bus error
+  [135]
 
 compare imported changes against reference file
 

ERROR: test-patch-offset.t output changed
!# Ret was: 0 (test-patch-offset.t) 
test-gpg.t
test-gpg.t ... # Test test-gpg.t 
# Timout reached for process 1169278 
# Killing daemon process 1169242 
# Timout reached for process 1169197 
# Daemon process 1169242 is stuck - really killing it 
# Ret was: 0 (test-narrow-acl-excludes.t) 
ok
test-revlog-raw.py
test-revlog-raw.py ... # Test test-revlog-raw.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-revlog-raw.py" 
# Running sh "/tmp/hgtests.qiewis6n/child808/test-gpg.t.sh" 
# Ret was: 0 (test-revlog-raw.py) 
ok
test-context-metadata.t
test-context-metadata.t ... # Test test-context-metadata.t 
# Running sh "/tmp/hgtests.qiewis6n/child810/test-context-metadata.t.sh" 
# Timout reached for process 1169330 
# Ret was: 0 (test-update-reverse.t) 
ok
test-pushvars.t
test-pushvars.t ... # Test test-pushvars.t 
# Running sh "/tmp/hgtests.qiewis6n/child811/test-pushvars.t.sh" 
# Timout reached for process 1169245 
# Ret was: 0 (test-merge9.t) 
ok
test-histedit-templates.t
test-histedit-templates.t ... # Test test-histedit-templates.t 
# Running sh "/tmp/hgtests.qiewis6n/child812/test-histedit-templates.t.sh" 
# Timout reached for process 1169228 
# Killing daemon process 1169340 
# Timout reached for process 1169333 
# Ret was: 0 (test-gpg.t) 
ok
test-hgwebdirsym.t
test-hgwebdirsym.t ... # Test test-hgwebdirsym.t 
# Running sh "/tmp/hgtests.qiewis6n/child813/test-hgwebdirsym.t.sh" 
# Ret was: 0 (test-context-metadata.t) 
ok
test-narrow-debugcommands.t
test-narrow-debugcommands.t ... # Test test-narrow-debugcommands.t 
# Running sh "/tmp/hgtests.qiewis6n/child814/test-narrow-debugcommands.t.sh" 
# Timout reached for process 1169352 
# Ret was: 0 (test-pushvars.t) 
ok
test-log-exthook.t
test-log-exthook.t ... # Test test-log-exthook.t 
# Running sh "/tmp/hgtests.qiewis6n/child815/test-log-exthook.t.sh" 
# Timout reached for process 1169361 
# Ret was: 0 (test-histedit-templates.t) 
ok
test-issue1802.t
test-issue1802.t ... # Test test-issue1802.t 
# Timout reached for process 1169387 
# Running sh "/tmp/hgtests.qiewis6n/child816/test-issue1802.t.sh" 
# Ret was: 0 (test-log-exthook.t) 
ok
test-branch-tag-confict.t
test-branch-tag-confict.t ... # Test test-branch-tag-confict.t 
# Running sh "/tmp/hgtests.qiewis6n/child817/test-branch-tag-confict.t.sh" 
# Timout reached for process 1169464 
# Killing daemon process 1169492 
# Timout reached for process 1169421 
# Daemon process 1169492 is stuck - really killing it 
# Ret was: 0 (test-hgwebdirsym.t) 
ok
test-custom-filters.t
test-custom-filters.t ... # Test test-custom-filters.t 
# Running sh "/tmp/hgtests.qiewis6n/child818/test-custom-filters.t.sh" 
# Ret was: 0 (test-narrow-debugcommands.t) 
ok
# Timout reached for process 1169450 
test-newcgi.t
test-newcgi.t ... # Test test-newcgi.t 
# Running sh "/tmp/hgtests.qiewis6n/child819/test-newcgi.t.sh" 
# Ret was: 0 (test-newcgi.t) 
ok
test-sparse-requirement.t
test-sparse-requirement.t ... # Test test-sparse-requirement.t 
# Running sh "/tmp/hgtests.qiewis6n/child820/test-sparse-requirement.t.sh" 
# Timout reached for process 1169554 
# Ret was: 0 (test-branch-tag-confict.t) 
ok
test-sparse-clone.t
test-sparse-clone.t ... # Test test-sparse-clone.t 
# Running sh "/tmp/hgtests.qiewis6n/child821/test-sparse-clone.t.sh" 
# Timout reached for process 1169509 
# Ret was: 0 (test-issue1802.t) 
ok
test-issue2137.t
test-issue2137.t ... # Test test-issue2137.t 
# Running sh "/tmp/hgtests.qiewis6n/child822/test-issue2137.t.sh" 
# Timout reached for process 1169486 
# Ret was: 0 (test-custom-filters.t) 
ok
test-manifest.py
test-manifest.py ... # Test test-manifest.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-manifest.py" 
# Timout reached for process 1169537 
# Ret was: 0 (test-issue2137.t) 
ok
test-merge-symlinks.t
test-merge-symlinks.t ... # Test test-merge-symlinks.t 
# Running sh "/tmp/hgtests.qiewis6n/child824/test-merge-symlinks.t.sh" 
# Timout reached for process 1169599 
# Ret was: 0 (test-manifest.py) 
ok
test-eolfilename.t
test-eolfilename.t ... # Test test-eolfilename.t 
# Timout reached for process 1169614 
# Timout reached for process 1169592 
# Ret was: 0 (test-sparse-clone.t) 
ok
test-merge10.t
test-merge10.t ... # Test test-merge10.t 
# Running sh "/tmp/hgtests.qiewis6n/child826/test-merge10.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child825/test-eolfilename.t.sh" 
# Timout reached for process 1169581 
# Ret was: 0 (test-merge-symlinks.t) 
ok
test-diffdir.t
test-diffdir.t ... # Test test-diffdir.t 
# Running sh "/tmp/hgtests.qiewis6n/child827/test-diffdir.t.sh" 
# Timout reached for process 1169628 
# Ret was: 0 (test-sparse-requirement.t) 
ok
test-schemes.t
test-schemes.t ... # Test test-schemes.t 
# Running sh "/tmp/hgtests.qiewis6n/child828/test-schemes.t.sh" 
# Ret was: 0 (test-eolfilename.t) 
ok
test-issue522.t
test-issue522.t ... # Test test-issue522.t 
# Running sh "/tmp/hgtests.qiewis6n/child829/test-issue522.t.sh" 
# Timout reached for process 1169683 
# Ret was: 0 (test-merge10.t) 
ok
test-mq-qgoto.t
test-mq-qgoto.t ... # Test test-mq-qgoto.t 
# Running sh "/tmp/hgtests.qiewis6n/child830/test-mq-qgoto.t.sh" 
# Timout reached for process 1169679 
# Killing daemon process 1169758 
# Timout reached for process 1169738 
# Daemon process 1169758 is stuck - really killing it 
# Ret was: 0 (test-schemes.t) 
ok
test-hooklib-reject_new_heads.t
test-hooklib-reject_new_heads.t ... # Test test-hooklib-reject_new_heads.t 
# Running sh "/tmp/hgtests.qiewis6n/child831/test-hooklib-reject_new_heads.t.sh" 
# Ret was: 0 (test-hooklib-reject_new_heads.t) 
ok
test-editor-filename.t
test-editor-filename.t ... # Test test-editor-filename.t 
# Running sh "/tmp/hgtests.qiewis6n/child832/test-editor-filename.t.sh" 
# Timout reached for process 1169808 
# Ret was: 0 (test-issue522.t) 
ok
test-url.py
test-url.py ... # Test test-url.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-url.py" 
# Timout reached for process 1169779 
# Ret was: 0 (test-diffdir.t) 
ok
test-convert-identity.t
test-convert-identity.t ... # Test test-convert-identity.t 
# Running sh "/tmp/hgtests.qiewis6n/child834/test-convert-identity.t.sh" 
# Timout reached for process 1169720 
# Ret was: 0 (test-url.py) 
ok
test-import-unknown.t
test-import-unknown.t ... # Test test-import-unknown.t 
# Running sh "/tmp/hgtests.qiewis6n/child835/test-import-unknown.t.sh" 
# Timout reached for process 1169852 
# Ret was: 0 (test-editor-filename.t) 
ok
test-unbundlehash.t
test-unbundlehash.t ... # Test test-unbundlehash.t 
# Running sh "/tmp/hgtests.qiewis6n/child836/test-unbundlehash.t.sh" 
# Timout reached for process 1169842 
# Ret was: 0 (test-unbundlehash.t) 
ok
test-newercgi.t
test-newercgi.t ... # Test test-newercgi.t 
# Timout reached for process 1169895 
# Ret was: 0 (test-convert-identity.t) 
ok
test-merge-revert.t
test-merge-revert.t ... # Test test-merge-revert.t 
# Running sh "/tmp/hgtests.qiewis6n/child838/test-merge-revert.t.sh" 
# Timout reached for process 1169858 
# Running sh "/tmp/hgtests.qiewis6n/child837/test-newercgi.t.sh" 
# Ret was: 0 (test-newercgi.t) 
ok
test-encode.t
test-encode.t ... # Test test-encode.t 
# Running sh "/tmp/hgtests.qiewis6n/child839/test-encode.t.sh" 
# Timout reached for process 1169947 
# Ret was: 0 (test-mq-qgoto.t) 
ok
test-admin-commands.py
test-admin-commands.py ... # Test test-admin-commands.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-admin-commands.py" 
# Timout reached for process 1169796 
# Ret was: 0 (test-admin-commands.py) 
ok
test-hooklib-enforce_draft_commits.t
test-hooklib-enforce_draft_commits.t ... # Test test-hooklib-enforce_draft_commits.t 
# Running sh "/tmp/hgtests.qiewis6n/child841/test-hooklib-enforce_draft_commits.t.sh" 
# Timout reached for process 1169988 
# Ret was: 0 (test-import-unknown.t) 
ok
test-casecollision.t
test-casecollision.t ... # Test test-casecollision.t 
# Timout reached for process 1169865 
# Running sh "/tmp/hgtests.qiewis6n/child842/test-casecollision.t.sh" 
# Ret was: 0 (test-hooklib-enforce_draft_commits.t) 
ok
test-remotefilelog-datapack.py
test-remotefilelog-datapack.py ... # Test test-remotefilelog-datapack.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-remotefilelog-datapack.py" 
# Timout reached for process 1170000 
# Ret was: 0 (test-encode.t) 
ok
test-ancestor.py
test-ancestor.py ... # Test test-ancestor.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-ancestor.py" 
# Timout reached for process 1169973 
# Ret was: 0 (test-ancestor.py) 
ok
test-missing-capability.t
test-missing-capability.t ... # Test test-missing-capability.t 
# Running sh "/tmp/hgtests.qiewis6n/child845/test-missing-capability.t.sh" 
# Timout reached for process 1170086 
# Ret was: 0 (test-remotefilelog-datapack.py) 
ok
test-update-dest.t
test-update-dest.t ... # Test test-update-dest.t 
# Running sh "/tmp/hgtests.qiewis6n/child846/test-update-dest.t.sh" 
# Timout reached for process 1170078 
# Ret was: 0 (test-casecollision.t) 
ok
test-dirstate-version-fallback.t
test-dirstate-version-fallback.t ... # Test test-dirstate-version-fallback.t 
# Running sh "/tmp/hgtests.qiewis6n/child847/test-dirstate-version-fallback.t.sh" 
# Timout reached for process 1170026 
# Ret was: 0 (test-missing-capability.t) 
ok
test-known.t
test-known.t ... # Test test-known.t 
# Running sh "/tmp/hgtests.qiewis6n/child848/test-known.t.sh" 
# Timout reached for process 1170097 
# Ret was: 0 (test-merge-revert.t) 
ok
test-revlog-mmapindex.t
test-revlog-mmapindex.t ... # Test test-revlog-mmapindex.t 
# Running sh "/tmp/hgtests.qiewis6n/child849/test-revlog-mmapindex.t.sh" 
# Timout reached for process 1169942 
# Ret was: 0 (test-update-dest.t) 
ok
test-sparse-fsmonitor.t
test-sparse-fsmonitor.t ... # Test test-sparse-fsmonitor.t 
# Running sh "/tmp/hgtests.qiewis6n/child850/test-sparse-fsmonitor.t.sh" 
skipped skipped
# Ret was: 80 (test-sparse-fsmonitor.t) 
test-journal-exists.t
test-journal-exists.t ... # Test test-journal-exists.t 
# Timout reached for process 1170124 
# Timout reached for process 1170218 
# Running sh "/tmp/hgtests.qiewis6n/child851/test-journal-exists.t.sh" 
# Timout reached for process 1170169 
# Ret was: 0 (test-dirstate-version-fallback.t) 
ok
test-no-symlinks.t
test-no-symlinks.t ... # Test test-no-symlinks.t 
# Running sh "/tmp/hgtests.qiewis6n/child852/test-no-symlinks.t.sh" 
skipped system supports symbolic links
# Ret was: 80 (test-no-symlinks.t) 
test-confused-revert.t
test-confused-revert.t ... # Test test-confused-revert.t 
# Running sh "/tmp/hgtests.qiewis6n/child853/test-confused-revert.t.sh" 
# Timout reached for process 1170252 
# Ret was: 0 (test-known.t) 
ok
test-convert-authormap.t
test-convert-authormap.t ... # Test test-convert-authormap.t 
# Running sh "/tmp/hgtests.qiewis6n/child854/test-convert-authormap.t.sh" 
# Timout reached for process 1170178 
# Ret was: 0 (test-journal-exists.t) 
ok
# Timout reached for process 1170229 
test-sparse-clear.t
test-sparse-clear.t ... # Test test-sparse-clear.t 
# Running sh "/tmp/hgtests.qiewis6n/child855/test-sparse-clear.t.sh" 
# Ret was: 0 (test-convert-authormap.t) 
ok
test-remotefilelog-permissions.t
test-remotefilelog-permissions.t ... # Test test-remotefilelog-permissions.t 
# Timout reached for process 1170302 
# Running sh "/tmp/hgtests.qiewis6n/child856/test-remotefilelog-permissions.t.sh" 
# Ret was: 0 (test-confused-revert.t) 
ok
test-subrepo-paths.t
test-subrepo-paths.t ... # Test test-subrepo-paths.t 
# Running sh "/tmp/hgtests.qiewis6n/child857/test-subrepo-paths.t.sh" 
# Timout reached for process 1170256 
# Ret was: 0 (test-sparse-clear.t) 
ok
test-merge2.t
test-merge2.t ... # Test test-merge2.t 
# Running sh "/tmp/hgtests.qiewis6n/child858/test-merge2.t.sh" 
# Timout reached for process 1170308 
# Ret was: 0 (test-subrepo-paths.t) 
ok
test-issue1993.t
test-issue1993.t ... # Test test-issue1993.t 
# Running sh "/tmp/hgtests.qiewis6n/child859/test-issue1993.t.sh" 
# Timout reached for process 1170379 
# Ret was: 0 (test-remotefilelog-permissions.t) 
ok
test-issue1502.t
test-issue1502.t ... # Test test-issue1502.t 
# Running sh "/tmp/hgtests.qiewis6n/child860/test-issue1502.t.sh" 
# Timout reached for process 1170362 
# Ret was: 0 (test-issue1993.t) 
ok
# Timout reached for process 1170431 
test-rebase-empty-successor.t
test-rebase-empty-successor.t ... # Test test-rebase-empty-successor.t 
# Running sh "/tmp/hgtests.qiewis6n/child861/test-rebase-empty-successor.t.sh" 
# Ret was: 0 (test-issue1502.t) 
ok
test-fix-pickle.t
test-fix-pickle.t ... # Test test-fix-pickle.t 
# Running sh "/tmp/hgtests.qiewis6n/child862/test-fix-pickle.t.sh" 
# Timout reached for process 1170453 
# Ret was: 0 (test-merge2.t) 
ok
test-remotefilelog-wireproto.t
test-remotefilelog-wireproto.t ... # Test test-remotefilelog-wireproto.t 
# Timout reached for process 1170387 
# Running sh "/tmp/hgtests.qiewis6n/child863/test-remotefilelog-wireproto.t.sh" 
# Ret was: 0 (test-fix-pickle.t) 
ok
test-revert-interactive-curses.t#committed
test-revert-interactive-curses.t#committed ... # Test test-revert-interactive-curses.t#committed 
# Timout reached for process 1170510 
# Running sh "/tmp/hgtests.qiewis6n/child864/test-revert-interactive-curses.t-committed.sh" 
# Ret was: 0 (test-rebase-empty-successor.t) 
ok
test-revert-interactive-curses.t#wdir
test-revert-interactive-curses.t#wdir ... # Test test-revert-interactive-curses.t#wdir 
# Timout reached for process 1170485 
# Running sh "/tmp/hgtests.qiewis6n/child865/test-revert-interactive-curses.t-wdir.sh" 
# Ret was: 0 (test-revert-interactive-curses.t#committed) 
ok
test-websub.t
test-websub.t ... # Test test-websub.t 
# Timout reached for process 1170584 
# Ret was: 0 (test-revert-interactive-curses.t#wdir) 
ok
test-rebase-brute-force.t
test-rebase-brute-force.t ... # Test test-rebase-brute-force.t 
# Running sh "/tmp/hgtests.qiewis6n/child867/test-rebase-brute-force.t.sh" 
# Timout reached for process 1170603 
# Running sh "/tmp/hgtests.qiewis6n/child866/test-websub.t.sh" 
# Timout reached for process 1170560 
# Killing daemon process 1170685 
# Timout reached for process 1170661 
# Daemon process 1170685 is stuck - really killing it 
# Ret was: 0 (test-websub.t) 
ok
test-simplemerge.py
test-simplemerge.py ... # Test test-simplemerge.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-simplemerge.py" 
# Ret was: 0 (test-remotefilelog-wireproto.t) 
ok
test-clone-cgi.t
test-clone-cgi.t ... # Test test-clone-cgi.t 
# Ret was: 0 (test-simplemerge.py) 
ok
test-diff-antipatience.t#bdiff
test-diff-antipatience.t#bdiff ... # Test test-diff-antipatience.t#bdiff 
# Running sh "/tmp/hgtests.qiewis6n/child870/test-diff-antipatience.t-bdiff.sh" 
# Timout reached for process 1170702 
# Running sh "/tmp/hgtests.qiewis6n/child869/test-clone-cgi.t.sh" 
# Ret was: 0 (test-rebase-brute-force.t) 
ok
test-diff-antipatience.t#xdiff
test-diff-antipatience.t#xdiff ... # Test test-diff-antipatience.t#xdiff 
# Timout reached for process 1170654 
# Ret was: 0 (test-diff-antipatience.t#bdiff) 
ok
test-issue1877.t
test-issue1877.t ... # Test test-issue1877.t 
# Running sh "/tmp/hgtests.qiewis6n/child872/test-issue1877.t.sh" 
# Timout reached for process 1170711 
# Running sh "/tmp/hgtests.qiewis6n/child871/test-diff-antipatience.t-xdiff.sh" 
# Ret was: 0 (test-clone-cgi.t) 
ok
test-empty-file.t
test-empty-file.t ... # Test test-empty-file.t 
# Running sh "/tmp/hgtests.qiewis6n/child873/test-empty-file.t.sh" 
# Timout reached for process 1170715 
# Ret was: 0 (test-diff-antipatience.t#xdiff) 
ok
test-parseindex2.py
test-parseindex2.py ... # Test test-parseindex2.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-parseindex2.py" 
# Timout reached for process 1170745 
# Ret was: 0 (test-parseindex2.py) 
ok
test-changelog-exec.t
test-changelog-exec.t ... # Test test-changelog-exec.t 
# Timout reached for process 1170769 
# Running sh "/tmp/hgtests.qiewis6n/child875/test-changelog-exec.t.sh" 
# Ret was: 0 (test-empty-file.t) 
ok
test-hgk.t
test-hgk.t ... # Test test-hgk.t 
# Running sh "/tmp/hgtests.qiewis6n/child876/test-hgk.t.sh" 
# Timout reached for process 1170753 
# Ret was: 0 (test-issue1877.t) 
ok
test-lrucachedict.py
test-lrucachedict.py ... # Test test-lrucachedict.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-lrucachedict.py" 
# Timout reached for process 1170739 
# Ret was: 0 (test-changelog-exec.t) 
ok
test-permissions.t#dirstate-v1
test-permissions.t#dirstate-v1 ... # Test test-permissions.t#dirstate-v1 
# Timout reached for process 1170792 
# Ret was: 0 (test-lrucachedict.py) 
ok
test-permissions.t#dirstate-v2
test-permissions.t#dirstate-v2 ... # Test test-permissions.t#dirstate-v2 
# Timout reached for process 1170846 
# Running sh "/tmp/hgtests.qiewis6n/child878/test-permissions.t-dirstate-v1.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child879/test-permissions.t-dirstate-v2.sh" 
# Ret was: 0 (test-hgk.t) 
ok
test-debian-packages.t
test-debian-packages.t ... # Test test-debian-packages.t 
# Timout reached for process 1170833 
# Running sh "/tmp/hgtests.qiewis6n/child880/test-debian-packages.t.sh" 
skipped missing feature: debian packaging tools
# Ret was: 80 (test-debian-packages.t) 
test-convert-bzr-ghosts.t
test-convert-bzr-ghosts.t ... # Test test-convert-bzr-ghosts.t 
# Timout reached for process 1170917 
# Running sh "/tmp/hgtests.qiewis6n/child881/test-convert-bzr-ghosts.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr-ghosts.t) 
test-diff-hashes.t
test-diff-hashes.t ... # Test test-diff-hashes.t 
# Running sh "/tmp/hgtests.qiewis6n/child882/test-diff-hashes.t.sh" 
# Timout reached for process 1170928 
# Ret was: 0 (test-permissions.t#dirstate-v1) 
ok
test-remotefilelog-histpack.py
test-remotefilelog-histpack.py ... # Test test-remotefilelog-histpack.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-remotefilelog-histpack.py" 
# Timout reached for process 1170865 
# Ret was: 0 (test-permissions.t#dirstate-v2) 
ok
test-legacy-exit-code.t
test-legacy-exit-code.t ... # Test test-legacy-exit-code.t 
# Running sh "/tmp/hgtests.qiewis6n/child884/test-legacy-exit-code.t.sh" 
# Timout reached for process 1170875 
# Ret was: 0 (test-diff-hashes.t) 
ok
test-docker-packaging.t
test-docker-packaging.t ... # Test test-docker-packaging.t 
# Timout reached for process 1170932 
# Running sh "/tmp/hgtests.qiewis6n/child885/test-docker-packaging.t.sh" 
skipped missing feature: docker support
# Ret was: 80 (test-docker-packaging.t) 
test-remotefilelog-hgweb.t
test-remotefilelog-hgweb.t ... # Test test-remotefilelog-hgweb.t 
# Timout reached for process 1170991 
# Ret was: 0 (test-remotefilelog-histpack.py) 
ok
test-bookmarks-strip.t
test-bookmarks-strip.t ... # Test test-bookmarks-strip.t 
# Running sh "/tmp/hgtests.qiewis6n/child887/test-bookmarks-strip.t.sh" 
# Timout reached for process 1170957 
# Running sh "/tmp/hgtests.qiewis6n/child886/test-remotefilelog-hgweb.t.sh" 
# Ret was: 0 (test-legacy-exit-code.t) 
ok
test-remotefilelog-keepset.t
test-remotefilelog-keepset.t ... # Test test-remotefilelog-keepset.t 
# Timout reached for process 1170967 
# Running sh "/tmp/hgtests.qiewis6n/child888/test-remotefilelog-keepset.t.sh" 
# Timout reached for process 1170199 
# Ret was: 0 (test-revlog-mmapindex.t) 
ok
test-absorb-edit-lines.t
test-absorb-edit-lines.t ... # Test test-absorb-edit-lines.t 
# Running sh "/tmp/hgtests.qiewis6n/child889/test-absorb-edit-lines.t.sh" 
# Killing daemon process 1171045 
# Timout reached for process 1171005 
# Daemon process 1171045 is stuck - really killing it 
# Ret was: 0 (test-remotefilelog-hgweb.t) 
ok
test-mactext.t
test-mactext.t ... # Test test-mactext.t 
# Running sh "/tmp/hgtests.qiewis6n/child890/test-mactext.t.sh" 
# Timout reached for process 1171001 
# Ret was: 0 (test-bookmarks-strip.t) 
ok
test-issue6642.t
test-issue6642.t ... # Test test-issue6642.t 
# Running sh "/tmp/hgtests.qiewis6n/child891/test-issue6642.t.sh" 
# Ret was: 0 (test-mactext.t) 
ok
test-diff-subdir.t
test-diff-subdir.t ... # Test test-diff-subdir.t 
# Running sh "/tmp/hgtests.qiewis6n/child892/test-diff-subdir.t.sh" 
# Timout reached for process 1171078 
# Ret was: 0 (test-remotefilelog-keepset.t) 
ok
test-remotefilelog-bad-configs.t
test-remotefilelog-bad-configs.t ... # Test test-remotefilelog-bad-configs.t 
# Timout reached for process 1171040 
# Running sh "/tmp/hgtests.qiewis6n/child893/test-remotefilelog-bad-configs.t.sh" 
# Ret was: 0 (test-absorb-edit-lines.t) 
ok
test-stdio.py
test-stdio.py ... # Test test-stdio.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-stdio.py" 
# Timout reached for process 1171066 
# Timout reached for process 1171121 
# Ret was: 0 (test-diff-subdir.t) 
ok
test-narrow-debugrebuilddirstate.t
test-narrow-debugrebuilddirstate.t ... # Test test-narrow-debugrebuilddirstate.t 
# Running sh "/tmp/hgtests.qiewis6n/child895/test-narrow-debugrebuilddirstate.t.sh" 
# Ret was: 0 (test-issue6642.t) 
ok
test-convert-bzr-114.t
test-convert-bzr-114.t ... # Test test-convert-bzr-114.t 
# Timout reached for process 1171104 
# Running sh "/tmp/hgtests.qiewis6n/child896/test-convert-bzr-114.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr-114.t) 
test-diff-reverse.t
test-diff-reverse.t ... # Test test-diff-reverse.t 
# Running sh "/tmp/hgtests.qiewis6n/child897/test-diff-reverse.t.sh" 
# Timout reached for process 1171204 
# Ret was: 0 (test-remotefilelog-bad-configs.t) 
ok
test-unrelated-pull.t
test-unrelated-pull.t ... # Test test-unrelated-pull.t 
# Running sh "/tmp/hgtests.qiewis6n/child898/test-unrelated-pull.t.sh" 
# Timout reached for process 1171144 
# Ret was: 0 (test-narrow-debugrebuilddirstate.t) 
ok
test-admin-commands.t
test-admin-commands.t ... # Test test-admin-commands.t 
# Running sh "/tmp/hgtests.qiewis6n/child899/test-admin-commands.t.sh" 
# Timout reached for process 1171182 
# Ret was: 0 (test-diff-reverse.t) 
ok
test-revset-dirstate-parents.t
test-revset-dirstate-parents.t ... # Test test-revset-dirstate-parents.t 
# Running sh "/tmp/hgtests.qiewis6n/child900/test-revset-dirstate-parents.t.sh" 
# Timout reached for process 1171208 
# Ret was: 0 (test-unrelated-pull.t) 
ok
test-trusted.py
test-trusted.py ... # Test test-trusted.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-trusted.py" 
# Timout reached for process 1171230 
# Ret was: 0 (test-admin-commands.t) 
ok
test-debugbackupbundle.t
test-debugbackupbundle.t ... # Test test-debugbackupbundle.t 
# Running sh "/tmp/hgtests.qiewis6n/child902/test-debugbackupbundle.t.sh" 
# Timout reached for process 1171249 
# Ret was: 0 (test-trusted.py) 
ok
test-wireproto-framing.py
test-wireproto-framing.py ... # Test test-wireproto-framing.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-wireproto-framing.py" 
# Timout reached for process 1171280 
# Ret was: 0 (test-wireproto-framing.py) 
ok
test-update-issue1456.t
test-update-issue1456.t ... # Test test-update-issue1456.t 
# Timout reached for process 1171293 
# Running sh "/tmp/hgtests.qiewis6n/child904/test-update-issue1456.t.sh" 
# Timout reached for process 1171286 
# Ret was: 0 (test-debugbackupbundle.t) 
ok
test-merge5.t
test-merge5.t ... # Test test-merge5.t 
# Running sh "/tmp/hgtests.qiewis6n/child905/test-merge5.t.sh" 
# Ret was: 0 (test-stdio.py) 
ok
test-convert-bzr-treeroot.t
test-convert-bzr-treeroot.t ... # Test test-convert-bzr-treeroot.t 
# Timout reached for process 1171156 
# Running sh "/tmp/hgtests.qiewis6n/child906/test-convert-bzr-treeroot.t.sh" 
skipped missing feature: Breezy library and executable version >= 3.1
# Ret was: 80 (test-convert-bzr-treeroot.t) 
test-narrow-archive.t
test-narrow-archive.t ... # Test test-narrow-archive.t 
# Running sh "/tmp/hgtests.qiewis6n/child907/test-narrow-archive.t.sh" 
# Timout reached for process 1171354 
# Ret was: 0 (test-update-issue1456.t) 
ok
test-absorb-unfinished.t
test-absorb-unfinished.t ... # Test test-absorb-unfinished.t 
# Running sh "/tmp/hgtests.qiewis6n/child908/test-absorb-unfinished.t.sh" 
# Timout reached for process 1171303 
# Ret was: 0 (test-revset-dirstate-parents.t) 
ok
test-diff-copy-depth.t
test-diff-copy-depth.t ... # Test test-diff-copy-depth.t 
# Running sh "/tmp/hgtests.qiewis6n/child909/test-diff-copy-depth.t.sh" 
# Timout reached for process 1171268 
# Ret was: 0 (test-merge5.t) 
ok
test-debug-rebuild-dirstate.t
test-debug-rebuild-dirstate.t ... # Test test-debug-rebuild-dirstate.t 
# Timout reached for process 1171337 
# Ret was: 0 (test-absorb-unfinished.t) 
ok
test-hgweb-bundle.t
test-hgweb-bundle.t ... # Test test-hgweb-bundle.t 
# Timout reached for process 1171379 
# Running sh "/tmp/hgtests.qiewis6n/child911/test-hgweb-bundle.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child910/test-debug-rebuild-dirstate.t.sh" 
skipped missing feature: Using the Rust extensions
# Ret was: 80 (test-debug-rebuild-dirstate.t) 
test-mq-qimport-fail-cleanup.t
test-mq-qimport-fail-cleanup.t ... # Test test-mq-qimport-fail-cleanup.t 
# Running sh "/tmp/hgtests.qiewis6n/child912/test-mq-qimport-fail-cleanup.t.sh" 
# Timout reached for process 1171434 
# Killing daemon process 1171408 
# Timout reached for process 1171358 
# Daemon process 1171408 is stuck - really killing it 
# Ret was: 0 (test-narrow-archive.t) 
ok
test-rhg-no-generaldelta.t
test-rhg-no-generaldelta.t ... # Test test-rhg-no-generaldelta.t 
# Running sh "/tmp/hgtests.qiewis6n/child913/test-rhg-no-generaldelta.t.sh" 
# Killing daemon process 1171470 
# Timout reached for process 1171428 
# Daemon process 1171470 is stuck - really killing it 
# Ret was: 0 (test-hgweb-bundle.t) 
ok
test-issue619.t
test-issue619.t ... # Test test-issue619.t 
# Running sh "/tmp/hgtests.qiewis6n/child914/test-issue619.t.sh" 
# Ret was: 0 (test-mq-qimport-fail-cleanup.t) 
ok
test-linelog.py
test-linelog.py ... # Test test-linelog.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-linelog.py" 
# Timout reached for process 1171438 
# Ret was: 0 (test-rhg-no-generaldelta.t) 
ok
test-linerange.py
test-linerange.py ... # Test test-linerange.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-linerange.py" 
# Timout reached for process 1171448 
# Ret was: 0 (test-linerange.py) 
ok
test-issue1102.t
test-issue1102.t ... # Test test-issue1102.t 
# Timout reached for process 1171498 
# Running sh "/tmp/hgtests.qiewis6n/child917/test-issue1102.t.sh" 
# Ret was: 0 (test-linelog.py) 
ok
test-fix-clang-format.t
test-fix-clang-format.t ... # Test test-fix-clang-format.t 
# Timout reached for process 1171492 
# Running sh "/tmp/hgtests.qiewis6n/child918/test-fix-clang-format.t.sh" 
skipped missing feature: clang-format C code formatter (>= 11)
# Ret was: 80 (test-fix-clang-format.t) 
test-manifest-merging.t
test-manifest-merging.t ... # Test test-manifest-merging.t 
# Running sh "/tmp/hgtests.qiewis6n/child919/test-manifest-merging.t.sh" 
# Timout reached for process 1171530 
# Ret was: 0 (test-diff-copy-depth.t) 
ok
test-status-eacces.t#dirstate-v1
test-status-eacces.t#dirstate-v1 ... # Test test-status-eacces.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child920/test-status-eacces.t-dirstate-v1.sh" 
# Timout reached for process 1171398 
# Ret was: 0 (test-issue619.t) 
ok
test-status-eacces.t#dirstate-v2
test-status-eacces.t#dirstate-v2 ... # Test test-status-eacces.t#dirstate-v2 
# Timout reached for process 1171486 
# Running sh "/tmp/hgtests.qiewis6n/child921/test-status-eacces.t-dirstate-v2.sh" 
# Ret was: 0 (test-issue1102.t) 
ok
test-issue842.t
test-issue842.t ... # Test test-issue842.t 
# Running sh "/tmp/hgtests.qiewis6n/child922/test-issue842.t.sh" 
# Timout reached for process 1171508 
# Timout reached for process 1171546 
# Timout reached for process 1171534 
# Ret was: 0 (test-manifest-merging.t) 
ok
test-merge8.t
test-merge8.t ... # Test test-merge8.t 
# Running sh "/tmp/hgtests.qiewis6n/child923/test-merge8.t.sh" 
# Timout reached for process 1171559 
# Ret was: 0 (test-status-eacces.t#dirstate-v1) 
ok
test-remotefilelog-blame.t
test-remotefilelog-blame.t ... # Test test-remotefilelog-blame.t 
# Ret was: 0 (test-issue842.t) 
ok
test-filecache.py
test-filecache.py ... # Test test-filecache.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-filecache.py" 
# Timout reached for process 1171566 
# Running sh "/tmp/hgtests.qiewis6n/child924/test-remotefilelog-blame.t.sh" 
# Ret was: 0 (test-status-eacces.t#dirstate-v2) 
ok
test-censor2.t
test-censor2.t ... # Test test-censor2.t 
# Running sh "/tmp/hgtests.qiewis6n/child926/test-censor2.t.sh" 
# Timout reached for process 1171649 
# Ret was: 0 (test-filecache.py) 
ok
test-revlog-group-emptyiter.t
test-revlog-group-emptyiter.t ... # Test test-revlog-group-emptyiter.t 
# Running sh "/tmp/hgtests.qiewis6n/child927/test-revlog-group-emptyiter.t.sh" 
# Ret was: 0 (test-merge8.t) 
ok
test-propertycache.py
test-propertycache.py ... # Test test-propertycache.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-propertycache.py" 
# Timout reached for process 1171608 
# Ret was: 0 (test-propertycache.py) 
ok
test-pathencode.py
test-pathencode.py ... # Test test-pathencode.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-pathencode.py" 
# Timout reached for process 1171692 
# Ret was: 0 (test-censor2.t) 
ok
test-archive-symlinks.t
test-archive-symlinks.t ... # Test test-archive-symlinks.t 
# Timout reached for process 1171663 
# Ret was: 0 (test-pathencode.py) 
ok
test-absorb-filefixupstate.py
test-absorb-filefixupstate.py ... # Test test-absorb-filefixupstate.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-absorb-filefixupstate.py" 
# Timout reached for process 1171708 
# Running sh "/tmp/hgtests.qiewis6n/child930/test-archive-symlinks.t.sh" 
# Ret was: 0 (test-absorb-filefixupstate.py) 
ok
test-absorb-strip.t
test-absorb-strip.t ... # Test test-absorb-strip.t 
# Running sh "/tmp/hgtests.qiewis6n/child932/test-absorb-strip.t.sh" 
# Timout reached for process 1171727 
# Ret was: 0 (test-revlog-group-emptyiter.t) 
ok
test-issue5979.t
test-issue5979.t ... # Test test-issue5979.t 
# Running sh "/tmp/hgtests.qiewis6n/child933/test-issue5979.t.sh" 
# Timout reached for process 1171687 
# Ret was: 0 (test-remotefilelog-blame.t) 
ok
test-context.py
test-context.py ... # Test test-context.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-context.py" 
# Timout reached for process 1171656 
# Ret was: 0 (test-archive-symlinks.t) 
ok
test-empty.t
test-empty.t ... # Test test-empty.t 
# Running sh "/tmp/hgtests.qiewis6n/child935/test-empty.t.sh" 
# Timout reached for process 1171732 
# Ret was: 0 (test-absorb-strip.t) 
ok
test-revisions.t
test-revisions.t ... # Test test-revisions.t 
# Running sh "/tmp/hgtests.qiewis6n/child936/test-revisions.t.sh" 
# Timout reached for process 1171743 
# Ret was: 0 (test-context.py) 
ok
test-wsgicgi.t
test-wsgicgi.t ... # Test test-wsgicgi.t 
# Running sh "/tmp/hgtests.qiewis6n/child937/test-wsgicgi.t.sh" 
# Timout reached for process 1171772 
# Ret was: 0 (test-wsgicgi.t) 
ok
test-remotefilelog-share.t#normal
test-remotefilelog-share.t#normal ... # Test test-remotefilelog-share.t#normal 
# Timout reached for process 1171792 
# Running sh "/tmp/hgtests.qiewis6n/child938/test-remotefilelog-share.t-normal.sh" 
# Ret was: 0 (test-empty.t) 
ok
test-remotefilelog-share.t#safe
test-remotefilelog-share.t#safe ... # Test test-remotefilelog-share.t#safe 
# Timout reached for process 1171778 
# Ret was: 0 (test-issue5979.t) 
ok
test-issue612.t
test-issue612.t ... # Test test-issue612.t 
# Running sh "/tmp/hgtests.qiewis6n/child940/test-issue612.t.sh" 
# Running sh "/tmp/hgtests.qiewis6n/child939/test-remotefilelog-share.t-safe.sh" 
# Timout reached for process 1171753 
# Ret was: 0 (test-remotefilelog-share.t#normal) 
ok
test-status-committed-and-ignored.t#dirstate-v1
test-status-committed-and-ignored.t#dirstate-v1 ... # Test test-status-committed-and-ignored.t#dirstate-v1 
# Running sh "/tmp/hgtests.qiewis6n/child941/test-status-committed-and-ignored.t-dirstate-v1.sh" 
# Timout reached for process 1171812 
# Ret was: 0 (test-status-committed-and-ignored.t#dirstate-v1) 
ok
test-status-committed-and-ignored.t#dirstate-v2
test-status-committed-and-ignored.t#dirstate-v2 ... # Test test-status-committed-and-ignored.t#dirstate-v2 
# Timout reached for process 1171881 
# Ret was: 0 (test-remotefilelog-share.t#safe) 
ok
test-batching.py
test-batching.py ... # Test test-batching.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-batching.py" 
# Timout reached for process 1171850 
# Running sh "/tmp/hgtests.qiewis6n/child942/test-status-committed-and-ignored.t-dirstate-v2.sh" 
# Ret was: 0 (test-issue612.t) 
ok
test-doctest.py
test-doctest.py ... # Test test-doctest.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-doctest.py" 
# Timout reached for process 1171846 
# Ret was: 0 (test-batching.py) 
ok
test-debugindexdot.t
test-debugindexdot.t ... # Test test-debugindexdot.t 
# Running sh "/tmp/hgtests.qiewis6n/child945/test-debugindexdot.t.sh" 
# Timout reached for process 1171917 
# Timout reached for process 1171786 
# Ret was: 0 (test-revisions.t) 
ok
test-lock.py
test-lock.py ... # Test test-lock.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-lock.py" 
# Ret was: 0 (test-lock.py) 
ok
test-rust-ancestor.py
test-rust-ancestor.py ... # Test test-rust-ancestor.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-rust-ancestor.py" 
# Timout reached for process 1171945 
# Ret was: 0 (test-doctest.py) 
ok
test-eol-tag.t
test-eol-tag.t ... # Test test-eol-tag.t 
# Running sh "/tmp/hgtests.qiewis6n/child948/test-eol-tag.t.sh" 
# Timout reached for process 1171928 
# Ret was: 0 (test-rust-ancestor.py) 
ok
test-empty-manifest-index.t
test-empty-manifest-index.t ... # Test test-empty-manifest-index.t 
# Running sh "/tmp/hgtests.qiewis6n/child949/test-empty-manifest-index.t.sh" 
# Timout reached for process 1171949 
# Ret was: 0 (test-status-committed-and-ignored.t#dirstate-v2) 
ok
test-ssh-batch.t
test-ssh-batch.t ... # Test test-ssh-batch.t 
# Running sh "/tmp/hgtests.qiewis6n/child950/test-ssh-batch.t.sh" 
# Timout reached for process 1171921 
# Ret was: 0 (test-eol-tag.t) 
ok
test-bdiff.py
test-bdiff.py ... # Test test-bdiff.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-bdiff.py" 
# Timout reached for process 1171957 
# Ret was: 0 (test-bdiff.py) 
ok
test-demandimport.py
test-demandimport.py ... # Test test-demandimport.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-demandimport.py" 
# Ret was: 0 (test-ssh-batch.t) 
ok
test-hgweb-auth.py
test-hgweb-auth.py ... # Test test-hgweb-auth.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hgweb-auth.py" 
# Timout reached for process 1172005 
# Timout reached for process 1171970 
# Ret was: 0 (test-empty-manifest-index.t) 
ok
test-nested-repo.t
test-nested-repo.t ... # Test test-nested-repo.t 
# Running sh "/tmp/hgtests.qiewis6n/child954/test-nested-repo.t.sh" 
# Timout reached for process 1171963 
# Ret was: 0 (test-debugindexdot.t) 
ok
test-execute-bit.t
test-execute-bit.t ... # Test test-execute-bit.t 
# Timout reached for process 1171938 
# Ret was: 0 (test-hgweb-auth.py) 
ok
test-minirst.py
test-minirst.py ... # Test test-minirst.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-minirst.py" 
# Timout reached for process 1172016 
# Ret was: 0 (test-demandimport.py) 
ok
test-username-newline.t
test-username-newline.t ... # Running sh "/tmp/hgtests.qiewis6n/child955/test-execute-bit.t.sh" 
# Test test-username-newline.t 
# Running sh "/tmp/hgtests.qiewis6n/child957/test-username-newline.t.sh" 
# Timout reached for process 1172012 
# Ret was: 0 (test-minirst.py) 
ok
test-issue4074.t
test-issue4074.t ... # Test test-issue4074.t 
# Timout reached for process 1172030 
# Running sh "/tmp/hgtests.qiewis6n/child958/test-issue4074.t.sh" 
# Ret was: 0 (test-username-newline.t) 
ok
test-revlog-packentry.t
test-revlog-packentry.t ... # Test test-revlog-packentry.t 
# Running sh "/tmp/hgtests.qiewis6n/child959/test-revlog-packentry.t.sh" 
# Timout reached for process 1172039 
# Ret was: 0 (test-issue4074.t) 
ok
test-fastannotate-revmap.py
test-fastannotate-revmap.py ... # Test test-fastannotate-revmap.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-fastannotate-revmap.py" 
# Timout reached for process 1172048 
# Ret was: 0 (test-fastannotate-revmap.py) 
ok
test-pull-permission.t
test-pull-permission.t ... # Test test-pull-permission.t 
# Timout reached for process 1172083 
# Running sh "/tmp/hgtests.qiewis6n/child961/test-pull-permission.t.sh" 
# Ret was: 0 (test-revlog-packentry.t) 
ok
test-ui-config.py
test-ui-config.py ... # Test test-ui-config.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-ui-config.py" 
# Timout reached for process 1172072 
# Ret was: 0 (test-execute-bit.t) 
ok
test-diff-issue2761.t
test-diff-issue2761.t ... # Test test-diff-issue2761.t 
# Running sh "/tmp/hgtests.qiewis6n/child963/test-diff-issue2761.t.sh" 
# Timout reached for process 1172035 
# Ret was: 0 (test-ui-config.py) 
ok
test-sparse-with-safe-share.t
test-sparse-with-safe-share.t ... # Test test-sparse-with-safe-share.t 
# Running sh "/tmp/hgtests.qiewis6n/child964/test-sparse-with-safe-share.t.sh" 
# Timout reached for process 1172106 
# Ret was: 0 (test-nested-repo.t) 
ok
test-strict.t
test-strict.t ... # Test test-strict.t 
# Running sh "/tmp/hgtests.qiewis6n/child965/test-strict.t.sh" 
# Timout reached for process 1172021 
# Ret was: 0 (test-pull-permission.t) 
ok
test-diff-newlines.t
test-diff-newlines.t ... # Test test-diff-newlines.t 
# Running sh "/tmp/hgtests.qiewis6n/child966/test-diff-newlines.t.sh" 
# Timout reached for process 1172096 
# Ret was: 0 (test-sparse-with-safe-share.t) 
ok
test-util.py
test-util.py ... # Test test-util.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-util.py" 
# Timout reached for process 1172118 
# Ret was: 0 (test-util.py) 
ok
test-atomictempfile.py
test-atomictempfile.py ... # Test test-atomictempfile.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-atomictempfile.py" 
# Timout reached for process 1172152 
# Ret was: 0 (test-atomictempfile.py) 
ok
test-rust-discovery.py
test-rust-discovery.py ... # Test test-rust-discovery.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-rust-discovery.py" 
# Timout reached for process 1172159 
# Ret was: 0 (test-rust-discovery.py) 
ok
test-extra-filelog-entry.t
test-extra-filelog-entry.t ... # Test test-extra-filelog-entry.t 
# Running sh "/tmp/hgtests.qiewis6n/child970/test-extra-filelog-entry.t.sh" 
# Timout reached for process 1172166 
# Ret was: 0 (test-diff-newlines.t) 
ok
test-storage.py
test-storage.py ... # Test test-storage.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-storage.py" 
# Timout reached for process 1172140 
# Ret was: 0 (test-diff-issue2761.t) 
ok
test-empty-dir.t
test-empty-dir.t ... # Test test-empty-dir.t 
# Running sh "/tmp/hgtests.qiewis6n/child972/test-empty-dir.t.sh" 
# Timout reached for process 1172112 
# Ret was: 0 (test-strict.t) 
ok
test-absorb-phase.t
test-absorb-phase.t ... # Test test-absorb-phase.t 
# Running sh "/tmp/hgtests.qiewis6n/child973/test-absorb-phase.t.sh" 
# Timout reached for process 1172127 
# Ret was: 0 (test-extra-filelog-entry.t) 
ok
test-debugrename.t
test-debugrename.t ... # Test test-debugrename.t 
# Running sh "/tmp/hgtests.qiewis6n/child974/test-debugrename.t.sh" 
# Timout reached for process 1172170 
# Ret was: 0 (test-empty-dir.t) 
ok
test-issue1438.t
test-issue1438.t ... # Test test-issue1438.t 
# Timout reached for process 1172186 
# Running sh "/tmp/hgtests.qiewis6n/child975/test-issue1438.t.sh" 
# Ret was: 0 (test-storage.py) 
ok
test-annotate.py
test-annotate.py ... # Test test-annotate.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-annotate.py" 
# Timout reached for process 1172177 
# Ret was: 0 (test-absorb-phase.t) 
ok
test-fastannotate-diffopts.t
test-fastannotate-diffopts.t ... # Test test-fastannotate-diffopts.t 
# Running sh "/tmp/hgtests.qiewis6n/child977/test-fastannotate-diffopts.t.sh" 
# Ret was: 0 (test-annotate.py) 
ok
test-revert-unknown.t
test-revert-unknown.t ... # Test test-revert-unknown.t 
# Running sh "/tmp/hgtests.qiewis6n/child978/test-revert-unknown.t.sh" 
# Timout reached for process 1172232 
# Timout reached for process 1172191 
# Ret was: 0 (test-fastannotate-diffopts.t) 
ok
test-bad-pull.t
test-bad-pull.t ... # Test test-bad-pull.t 
# Timout reached for process 1172237 
# Running sh "/tmp/hgtests.qiewis6n/child979/test-bad-pull.t.sh" 
# Ret was: 0 (test-debugrename.t) 
ok
test-backwards-remove.t
test-backwards-remove.t ... # Test test-backwards-remove.t 
# Running sh "/tmp/hgtests.qiewis6n/child980/test-backwards-remove.t.sh" 
# Timout reached for process 1172208 
# Ret was: 0 (test-issue1438.t) 
ok
test-issue1089.t
test-issue1089.t ... # Test test-issue1089.t 
# Running sh "/tmp/hgtests.qiewis6n/child981/test-issue1089.t.sh" 
# Timout reached for process 1172223 
# Ret was: 0 (test-revert-unknown.t) 
ok
test-revert-flags.t
test-revert-flags.t ... # Test test-revert-flags.t 
# Timout reached for process 1172244 
# Running sh "/tmp/hgtests.qiewis6n/child982/test-revert-flags.t.sh" 
# Ret was: 0 (test-bad-pull.t) 
ok
test-rust-revlog.py
test-rust-revlog.py ... # Test test-rust-revlog.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-rust-revlog.py" 
# Timout reached for process 1172272 
# Ret was: 0 (test-rust-revlog.py) 
ok
test-simplekeyvaluefile.py
test-simplekeyvaluefile.py ... # Test test-simplekeyvaluefile.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-simplekeyvaluefile.py" 
# Timout reached for process 1172317 
# Ret was: 0 (test-backwards-remove.t) 
ok
test-dirstate-backup.t
test-dirstate-backup.t ... # Test test-dirstate-backup.t 
# Running sh "/tmp/hgtests.qiewis6n/child985/test-dirstate-backup.t.sh" 
# Timout reached for process 1172277 
# Ret was: 0 (test-simplekeyvaluefile.py) 
ok
test-contrib-emacs.t
test-contrib-emacs.t ... # Test test-contrib-emacs.t 
# Timout reached for process 1172322 
# Running sh "/tmp/hgtests.qiewis6n/child986/test-contrib-emacs.t.sh" 
skipped missing feature: GNU Emacs
# Ret was: 80 (test-contrib-emacs.t) 
test-cappedreader.py
test-cappedreader.py ... # Test test-cappedreader.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-cappedreader.py" 
# Timout reached for process 1172342 
# Ret was: 0 (test-cappedreader.py) 
ok
test-wireproto.py
test-wireproto.py ... # Test test-wireproto.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-wireproto.py" 
# Timout reached for process 1172346 
# Ret was: 0 (test-wireproto.py) 
ok
test-xdg.t
test-xdg.t ... # Test test-xdg.t 
# Timout reached for process 1172352 
# Ret was: 0 (test-issue1089.t) 
ok
test-mq-qsave.t
test-mq-qsave.t ... # Test test-mq-qsave.t 
# Running sh "/tmp/hgtests.qiewis6n/child990/test-mq-qsave.t.sh" 
# Timout reached for process 1172291 
# Running sh "/tmp/hgtests.qiewis6n/child989/test-xdg.t.sh" 
# Ret was: 0 (test-dirstate-backup.t) 
ok
test-encoding-func.py
test-encoding-func.py ... # Test test-encoding-func.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-encoding-func.py" 
# Timout reached for process 1172329 
# Ret was: 0 (test-revert-flags.t) 
ok
test-purge-ignored-directory.t
test-purge-ignored-directory.t ... # Test test-purge-ignored-directory.t 
# Running sh "/tmp/hgtests.qiewis6n/child992/test-purge-ignored-directory.t.sh" 
# Timout reached for process 1172307 
# Ret was: 0 (test-encoding-func.py) 
ok
test-extensions-wrapfunction.py
test-extensions-wrapfunction.py ... # Test test-extensions-wrapfunction.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-extensions-wrapfunction.py" 
# Ret was: 0 (test-xdg.t) 
ok
test-walkrepo.py
test-walkrepo.py ... # Test test-walkrepo.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-walkrepo.py" 
# Timout reached for process 1172378 
# Timout reached for process 1172369 
# Ret was: 0 (test-extensions-wrapfunction.py) 
ok
test-hashutil.py
test-hashutil.py ... # Test test-hashutil.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hashutil.py" 
# Timout reached for process 1172388 
# Ret was: 0 (test-hashutil.py) 
ok
test-revlog-ancestry.py
test-revlog-ancestry.py ... # Test test-revlog-ancestry.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-revlog-ancestry.py" 
# Ret was: 0 (test-walkrepo.py) 
ok
# Timout reached for process 1172398 
test-config-parselist.py
test-config-parselist.py ... # Test test-config-parselist.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-config-parselist.py" 
# Timout reached for process 1172392 
# Ret was: 0 (test-config-parselist.py) 
ok
test-sshserver.py
test-sshserver.py ... # Test test-sshserver.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-sshserver.py" 
# Timout reached for process 1172409 
# Ret was: 0 (test-purge-ignored-directory.t) 
ok
test-hg-parseurl.py
test-hg-parseurl.py ... # Test test-hg-parseurl.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hg-parseurl.py" 
# Timout reached for process 1172382 
# Ret was: 0 (test-hg-parseurl.py) 
ok
test-ui-verbosity.py
test-ui-verbosity.py ... # Test test-ui-verbosity.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-ui-verbosity.py" 
# Timout reached for process 1172419 
# Ret was: 0 (test-revlog-ancestry.py) 
ok
test-filelog.py
test-filelog.py ... # Test test-filelog.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-filelog.py" 
# Timout reached for process 1172402 
# Ret was: 0 (test-sshserver.py) 
ok
test-symlink-os-yes-fs-no.py
test-symlink-os-yes-fs-no.py ... # Test test-symlink-os-yes-fs-no.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-symlink-os-yes-fs-no.py" 
# Timout reached for process 1172414 
# Ret was: 0 (test-mq-qsave.t) 
ok
test-hgwebdir-gc.py
test-hgwebdir-gc.py ... # Test test-hgwebdir-gc.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hgwebdir-gc.py" 
# Timout reached for process 1172365 
# Ret was: 0 (test-ui-verbosity.py) 
ok
test-config-env.py
test-config-env.py ... # Test test-config-env.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-config-env.py" 
# Timout reached for process 1172423 
# Ret was: 0 (test-filelog.py) 
ok
test-minifileset.py
test-minifileset.py ... # Test test-minifileset.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-minifileset.py" 
# Timout reached for process 1172428 
# Ret was: 0 (test-config-env.py) 
ok
test-locale.t
test-locale.t ... # Test test-locale.t 
# Running sh "/tmp/hgtests.qiewis6n/child1006/test-locale.t.sh" 
# Timout reached for process 1172440 
# Ret was: 0 (test-minifileset.py) 
ok
test-lfs-pointer.py
test-lfs-pointer.py ... # Test test-lfs-pointer.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-lfs-pointer.py" 
# Timout reached for process 1172444 
# Ret was: 0 (test-hgwebdir-gc.py) 
ok
test-duplicateoptions.py
test-duplicateoptions.py ... # Test test-duplicateoptions.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-duplicateoptions.py" 
# Timout reached for process 1172436 
# Ret was: 0 (test-locale.t) 
ok
test-hgwebdir-paths.py
test-hgwebdir-paths.py ... # Test test-hgwebdir-paths.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-hgwebdir-paths.py" 
# Timout reached for process 1172448 
# Ret was: 0 (test-lfs-pointer.py) 
ok
test-ui-color.py
test-ui-color.py ... # Test test-ui-color.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-ui-color.py" 
# Timout reached for process 1172453 
# Ret was: 0 (test-symlink-os-yes-fs-no.py) 
ok
test-dispatch.py
test-dispatch.py ... # Test test-dispatch.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-dispatch.py" 
# Timout reached for process 1172432 
# Ret was: 0 (test-hgwebdir-paths.py) 
ok
test-status-inprocess.py
test-status-inprocess.py ... # Test test-status-inprocess.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-status-inprocess.py" 
# Timout reached for process 1172461 
# Ret was: 0 (test-duplicateoptions.py) 
ok
test-dirs.py
test-dirs.py ... # Test test-dirs.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-dirs.py" 
# Timout reached for process 1172457 
# Ret was: 0 (test-dirs.py) 
ok
# Ret was: 0 (test-ui-color.py) 
test-ui-color.py
test-ui-color.py ... ok
test-mdiff.py
test-mdiff.py ... # Test test-mdiff.py 
# Running "/usr/bin/python3" "/<<PKGBUILDDIR>>/tests/test-mdiff.py" 
# Timout reached for process 1172465 
# Timout reached for process 1172477 
# Ret was: 0 (test-status-inprocess.py) 
ok
# Ret was: 0 (test-dispatch.py) 
test-dispatch.py
test-dispatch.py ... ok
# Ret was: 0 (test-mdiff.py) 
test-mdiff.py
test-mdiff.py ... ok

Skipped test-casecollision-merge.t: missing feature: case insensitive file system
Skipped test-casefolding.t: missing feature: case insensitive file system
Skipped test-check-cargo-lock.t: missing feature: running tests from repository
Skipped test-check-clang-format.t: missing feature: running tests from repository
Skipped test-check-code.t: missing feature: running tests from repository
Skipped test-check-commit.t: missing feature: running tests from repository
Skipped test-check-config.t: missing feature: running tests from repository
Skipped test-check-encoding.t: missing feature: running tests from repository
Skipped test-check-execute.t: missing feature: running tests from repository
Skipped test-check-format.t: missing feature: running tests from repository
Skipped test-check-help.t: missing feature: running tests from repository
Skipped test-check-interfaces.py: missing feature: running tests from repository
Skipped test-check-jshint.t: missing feature: JSHint static code analysis tool
Skipped test-check-module-imports.t: missing feature: running tests from repository
Skipped test-check-py3-compat.t: missing feature: running with pure Python code
Skipped test-check-pyflakes.t: blacklisted
Skipped test-check-pylint.t: missing feature: Pylint python linter
Skipped test-check-rust-format.t: missing feature: running tests from repository
Skipped test-check-shbang.t: missing feature: running tests from repository
Skipped test-chg.t: missing feature: running with chg
Skipped test-clonebundles.t: blacklisted
Skipped test-commandserver.t: blacklisted
Skipped test-contrib-emacs.t: missing feature: GNU Emacs
Skipped test-contrib-perf.t: missing feature: running tests from repository
Skipped test-contrib-relnotes.t: missing feature: a Python 3.x interpreter is available
Skipped test-convert-baz.t: missing feature: GNU Arch baz client
Skipped test-convert-bzr-114.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-bzr-directories.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-bzr-ghosts.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-bzr-merges.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-bzr-treeroot.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-bzr.t: missing feature: Breezy library and executable version >= 3.1
Skipped test-convert-cvs-branch.t: missing feature: cvs client/server
Skipped test-convert-cvs-detectmerge.t: missing feature: cvs client/server
Skipped test-convert-cvs-synthetic.t: blacklisted
Skipped test-convert-cvs.t: missing feature: cvs client/server
Skipped test-convert-cvsnt-mergepoints.t: missing feature: cvs client/server
Skipped test-convert-darcs.t: blacklisted
Skipped test-convert-git.t: missing feature: git command line client
Skipped test-convert-hg-svn.t: missing feature: subversion python bindings
Skipped test-convert-mtn.t: missing feature: monotone client (>= 1.0)
Skipped test-convert-p4-filetypes.t: missing feature: Perforce server and client
Skipped test-convert-p4.t: missing feature: Perforce server and client
Skipped test-convert-svn-branches.t: blacklisted
Skipped test-convert-svn-encoding.t: missing feature: subversion python bindings
Skipped test-convert-svn-move.t: missing feature: subversion python bindings
Skipped test-convert-svn-sink.t: missing feature: subversion client and admin tools >= 1.3
Skipped test-convert-svn-source.t: missing feature: subversion python bindings
Skipped test-convert-svn-startrev.t: missing feature: subversion python bindings
Skipped test-convert-svn-tags.t: missing feature: subversion python bindings
Skipped test-convert-tagsbranch-topology.t: missing feature: git command line client
Skipped test-convert-tla.t: missing feature: GNU Arch tla client
Skipped test-copies-chain-merge.t#changeset: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#compatibility: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#filelog: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#pull: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#pull-upgrade: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#push: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#push-upgrade: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#sidedata: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#upgraded: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-copies-chain-merge.t#upgraded-parallel: missing feature: allow slow tests (use --allow-slow-tests)
Skipped test-debian-packages.t: missing feature: debian packaging tools
Skipped test-debug-rebuild-dirstate.t: missing feature: Using the Rust extensions
Skipped test-debugcommands.t: blacklisted
Skipped test-docker-packaging.t: missing feature: docker support
Skipped test-fix-clang-format.t: missing feature: clang-format C code formatter (>= 11)
Skipped test-fuzz-targets.t: missing feature: running tests from repository
Skipped test-git-interop.t: blacklisted
Skipped test-highlight.t: missing feature: Pygments source highlighting library
Skipped test-imports-checker.t: missing feature: running tests from repository
Skipped test-largefiles.t: blacklisted
Skipped test-lfs-test-server.t#git-server: missing feature: git-lfs test server
Skipped test-mac-packages.t: missing feature: OS X packaging tools
Skipped test-mq-subrepo-svn.t: missing feature: subversion client and admin tools >= 1.3
Skipped test-no-symlinks.t: system supports symbolic links
Skipped test-phabricator.t: missing feature: vcr http mocking library (pytest-vcr)
Skipped test-releasenotes-formatting.t: missing feature: Fuzzy string matching library
Skipped test-releasenotes-merging.t: missing feature: Fuzzy string matching library
Skipped test-releasenotes-parsing.t: missing feature: Fuzzy string matching library
Skipped test-remotefilelog-bundle2-legacy.t: skipped
Skipped test-remotefilelog-gc.t: blacklisted
Skipped test-rhg-sparse-narrow.t: missing feature: running with rhg as 'hg'
Skipped test-rhg.t: missing feature: running with rhg as 'hg'
Skipped test-sparse-fsmonitor.t: skipped
Skipped test-sparse-revlog.t: missing artifact, run "/<<PKGBUILDDIR>>/tests/artifacts/scripts/generate-churning-bundle.py"
Skipped test-sqlitestore.t: missing feature: sqlite3 module and matching cli is available
Skipped test-subrepo-git.t: missing feature: git command line client
Skipped test-subrepo-svn.t: missing feature: subversion client and admin tools >= 1.5
Skipped test-verify-repo-operations.py: missing feature: allow slow tests (use --allow-slow-tests)
Failed test-amend.t#obsstore-off: output changed
Failed test-amend.t#obsstore-on: output changed
Failed test-clone-stream-format.t#stream-bundle2: output changed
Failed test-clone-stream-format.t#stream-legacy: output changed
Failed test-clone-stream.t#stream-bundle2-v2: output changed
Failed test-clone-stream.t#stream-bundle2-v3: output changed
Failed test-clone-stream.t#stream-legacy: output changed
Failed test-commit-interactive.t: output changed
Failed test-diff-unified.t: output changed
Failed test-fileset-generated.t: output changed
Failed test-fix.t: output changed
Failed test-git-export.t: output changed
Failed test-grep.t: output changed
Failed test-import.t: output changed
Failed test-merge-force.t: output changed
Failed test-narrow-clone.t: output changed
Failed test-narrow-patterns.t: output changed
Failed test-narrow-shallow.t: output changed
Failed test-patch-offset.t: output changed
Failed test-persistent-nodemap-stream-clone.t#stream-v2: output changed
Failed test-persistent-nodemap-stream-clone.t#stream-v3: output changed
Failed test-persistent-nodemap.t: output changed
Failed test-rename-dir-merge.t: output changed
Failed test-resolve.t: output changed
Failed test-revert.t: output changed
Failed test-status-rev.t: output changed
Failed test-treemanifest.t: output changed and returned error code 1
Failed test-unionrepo.t: output changed
# Ran 934 tests, 90 skipped, 28 failed.
python hash seed: 1835480268
# Timout reached for process 1172473 
# Timout reached for process 1172481 
# Timout reached for process 1172469 
# Cleaning up HGTMP /tmp/hgtests.qiewis6n 
make[2]: *** [Makefile:140: tests] Error 1
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
dh_auto_test: error: make -j4 check PYTHON=python3 "TESTFLAGS=--verbose --timeout 1800 --jobs 4 --blacklist /<<PKGBUILDDIR>>/debian/mercurial.test_blacklist" returned exit code 2
make[1]: *** [debian/rules:47: override_dh_auto_test] Error 25
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:8: binary-arch] Error 2
dpkg-buildpackage: error: debian/rules binary-arch subprocess returned exit status 2
--------------------------------------------------------------------------------
Build finished at 2024-07-25T07:57:45Z

Finished
--------


+------------------------------------------------------------------------------+
| Cleanup                                                                      |
+------------------------------------------------------------------------------+

Purging /<<BUILDDIR>>
Not cleaning session: cloned chroot in use
E: Build failure (dpkg-buildpackage died)

+------------------------------------------------------------------------------+
| Summary                                                                      |
+------------------------------------------------------------------------------+

Build Architecture: armhf
Build Type: any
Build-Space: 83884
Build-Time: 6859
Distribution: trixie-staging
Fail-Stage: build
Host Architecture: armhf
Install-Time: 21
Job: mercurial_6.8-3
Machine Architecture: arm64
Package: mercurial
Package-Time: 6891
Source-Version: 6.8-3
Space: 83884
Status: attempted
Version: 6.8-3
--------------------------------------------------------------------------------
Finished at 2024-07-25T07:57:45Z
Build needed 01:54:51, 83884k disk space