Diff of the two buildlogs:

--
--- b1/build.log	2021-06-22 04:03:20.117323149 +0000
+++ b2/build.log	2021-06-22 04:05:10.769159377 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Mon Jun 21 13:55:05 -12 2021
-I: pbuilder-time-stamp: 1624326905
+I: Current time: Tue Jul 26 00:26:22 +14 2022
+I: pbuilder-time-stamp: 1658744782
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bullseye-reproducible-base.tgz]
 I: copying local configuration
@@ -17,8 +17,8 @@
 I: copying [./reposurgeon_4.25-1.debian.tar.xz]
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
-gpgv: keyblock resource '/tmp/dpkg-verify-sig.VjK4IPY_/trustedkeys.kbx': General error
-gpgv: Signature made Thu Mar  4 15:00:26 2021 -12
+gpgv: keyblock resource '/tmp/dpkg-verify-sig.MydWaNM9/trustedkeys.kbx': General error
+gpgv: Signature made Fri Mar  5 17:00:26 2021 +14
 gpgv:                using RSA key 142421B19AD4A95996F95072EA2500B412C59ACF
 gpgv:                issuer "foka@debian.org"
 gpgv: Can't check signature: No public key
@@ -30,137 +30,171 @@
 dpkg-source: info: applying 0001-Makefile-skip-build.patch
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/15364/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos6-i386.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash'
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='i386'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=10'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='i386'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="1" [2]="4" [3]="1" [4]="release" [5]="i686-pc-linux-gnu")
+  BASH_VERSION='5.1.4(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=i386
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=18'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=i686
+  HOST_ARCH=i386
   IFS=' 	
   '
-  INVOCATION_ID='022df11ba1e0464fa1e79f46e3f77950'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  LD_LIBRARY_PATH='/usr/lib/libeatmydata'
-  LD_PRELOAD='libeatmydata.so'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='15364'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=6f6e1b75fe80402da562072eb04c1f4d
+  LANG=C
+  LANGUAGE=de_CH:de
+  LC_ALL=C
+  LD_LIBRARY_PATH=/usr/lib/libeatmydata
+  LD_PRELOAD=libeatmydata.so
+  MACHTYPE=i686-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=5336
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.S7LFwpgS3l/pbuilderrc_NjIV --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.S7LFwpgS3l/b1 --logfile b1/build.log reposurgeon_4.25-1.dsc'
-  SUDO_GID='112'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://78.137.99.97:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.S7LFwpgS3l/pbuilderrc_NiEc --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.S7LFwpgS3l/b2 --logfile b2/build.log --extrapackages usrmerge reposurgeon_4.25-1.dsc'
+  SUDO_GID=112
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://85.184.249.68:3128
 I: uname -a
-  Linux ionos2-i386 4.19.0-17-686-pae #1 SMP Debian 4.19.194-1 (2021-06-10) i686 GNU/Linux
+  Linux i-capture-the-hostname 4.19.0-17-amd64 #1 SMP Debian 4.19.194-1 (2021-06-10) x86_64 GNU/Linux
 I: ls -l /bin
-  total 5780
-  -rwxr-xr-x 1 root root 1367848 Feb 24 08:57 bash
-  -rwxr-xr-x 3 root root   38280 Jul 20  2020 bunzip2
-  -rwxr-xr-x 3 root root   38280 Jul 20  2020 bzcat
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root    2225 Jul 20  2020 bzdiff
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root    4877 Sep  4  2019 bzexe
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root    3775 Jul 20  2020 bzgrep
-  -rwxr-xr-x 3 root root   38280 Jul 20  2020 bzip2
-  -rwxr-xr-x 1 root root   17768 Jul 20  2020 bzip2recover
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzless -> bzmore
-  -rwxr-xr-x 1 root root    1297 Jul 20  2020 bzmore
-  -rwxr-xr-x 1 root root   38824 Sep 22  2020 cat
-  -rwxr-xr-x 1 root root   71624 Sep 22  2020 chgrp
-  -rwxr-xr-x 1 root root   67528 Sep 22  2020 chmod
-  -rwxr-xr-x 1 root root   75752 Sep 22  2020 chown
-  -rwxr-xr-x 1 root root  157960 Sep 22  2020 cp
-  -rwxr-xr-x 1 root root  128724 Dec 10  2020 dash
-  -rwxr-xr-x 1 root root  124904 Sep 22  2020 date
-  -rwxr-xr-x 1 root root   92172 Sep 22  2020 dd
-  -rwxr-xr-x 1 root root  100752 Sep 22  2020 df
-  -rwxr-xr-x 1 root root  153964 Sep 22  2020 dir
-  -rwxr-xr-x 1 root root   83644 Feb  7 02:38 dmesg
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 domainname -> hostname
-  -rwxr-xr-x 1 root root   34664 Sep 22  2020 echo
-  -rwxr-xr-x 1 root root      28 Nov  9  2020 egrep
-  -rwxr-xr-x 1 root root   34664 Sep 22  2020 false
-  -rwxr-xr-x 1 root root      28 Nov  9  2020 fgrep
-  -rwxr-xr-x 1 root root   71928 Feb  7 02:38 findmnt
-  -rwsr-xr-x 1 root root   30112 Feb 26 04:12 fusermount
-  -rwxr-xr-x 1 root root  210488 Nov  9  2020 grep
-  -rwxr-xr-x 2 root root    2346 Mar  2 11:30 gunzip
-  -rwxr-xr-x 1 root root    6376 Mar  2 11:30 gzexe
-  -rwxr-xr-x 1 root root  100952 Mar  2 11:30 gzip
-  -rwxr-xr-x 1 root root   21916 Nov  6  2019 hostname
-  -rwxr-xr-x 1 root root   83980 Sep 22  2020 ln
-  -rwxr-xr-x 1 root root   55572 Feb  7  2020 login
-  -rwxr-xr-x 1 root root  153964 Sep 22  2020 ls
-  -rwxr-xr-x 1 root root  153124 Feb  7 02:38 lsblk
-  -rwxr-xr-x 1 root root   96328 Sep 22  2020 mkdir
-  -rwxr-xr-x 1 root root   79912 Sep 22  2020 mknod
-  -rwxr-xr-x 1 root root   47048 Sep 22  2020 mktemp
-  -rwxr-xr-x 1 root root   58920 Feb  7 02:38 more
-  -rwsr-xr-x 1 root root   50720 Feb  7 02:38 mount
-  -rwxr-xr-x 1 root root   13856 Feb  7 02:38 mountpoint
-  -rwxr-xr-x 1 root root  157996 Sep 22  2020 mv
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root      14 Apr 18 03:38 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root   38824 Sep 22  2020 pwd
-  lrwxrwxrwx 1 root root       4 Feb 24 08:57 rbash -> bash
-  -rwxr-xr-x 1 root root   46984 Sep 22  2020 readlink
-  -rwxr-xr-x 1 root root   75720 Sep 22  2020 rm
-  -rwxr-xr-x 1 root root   46984 Sep 22  2020 rmdir
-  -rwxr-xr-x 1 root root   22292 Sep 27  2020 run-parts
-  -rwxr-xr-x 1 root root  125036 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root       4 Jun 19 21:25 sh -> dash
-  -rwxr-xr-x 1 root root   34696 Sep 22  2020 sleep
-  -rwxr-xr-x 1 root root   83880 Sep 22  2020 stty
-  -rwsr-xr-x 1 root root   79396 Feb  7 02:38 su
-  -rwxr-xr-x 1 root root   34696 Sep 22  2020 sync
-  -rwxr-xr-x 1 root root  602584 Feb 16 21:55 tar
-  -rwxr-xr-x 1 root root   13860 Sep 27  2020 tempfile
-  -rwxr-xr-x 1 root root  108520 Sep 22  2020 touch
-  -rwxr-xr-x 1 root root   34664 Sep 22  2020 true
-  -rwxr-xr-x 1 root root   17768 Feb 26 04:12 ulockmgr_server
-  -rwsr-xr-x 1 root root   30236 Feb  7 02:38 umount
-  -rwxr-xr-x 1 root root   34664 Sep 22  2020 uname
-  -rwxr-xr-x 2 root root    2346 Mar  2 11:30 uncompress
-  -rwxr-xr-x 1 root root  153964 Sep 22  2020 vdir
-  -rwxr-xr-x 1 root root   63024 Feb  7 02:38 wdctl
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root    1984 Mar  2 11:30 zcat
-  -rwxr-xr-x 1 root root    1678 Mar  2 11:30 zcmp
-  -rwxr-xr-x 1 root root    5880 Mar  2 11:30 zdiff
-  -rwxr-xr-x 1 root root      29 Mar  2 11:30 zegrep
-  -rwxr-xr-x 1 root root      29 Mar  2 11:30 zfgrep
-  -rwxr-xr-x 1 root root    2081 Mar  2 11:30 zforce
-  -rwxr-xr-x 1 root root    7585 Mar  2 11:30 zgrep
-  -rwxr-xr-x 1 root root    2206 Mar  2 11:30 zless
-  -rwxr-xr-x 1 root root    1842 Mar  2 11:30 zmore
-  -rwxr-xr-x 1 root root    4553 Mar  2 11:30 znew
-I: user script /srv/workspace/pbuilder/15364/tmp/hooks/D02_print_environment finished
+  total 5776
+  -rwxr-xr-x 1 root root 1367848 Feb 25  2021 bash
+  -rwxr-xr-x 3 root root   38280 Jul 21  2020 bunzip2
+  -rwxr-xr-x 3 root root   38280 Jul 21  2020 bzcat
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root    2225 Jul 21  2020 bzdiff
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root    4877 Sep  5  2019 bzexe
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root    3775 Jul 21  2020 bzgrep
+  -rwxr-xr-x 3 root root   38280 Jul 21  2020 bzip2
+  -rwxr-xr-x 1 root root   17768 Jul 21  2020 bzip2recover
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzless -> bzmore
+  -rwxr-xr-x 1 root root    1297 Jul 21  2020 bzmore
+  -rwxr-xr-x 1 root root   38824 Sep 23  2020 cat
+  -rwxr-xr-x 1 root root   71624 Sep 23  2020 chgrp
+  -rwxr-xr-x 1 root root   67528 Sep 23  2020 chmod
+  -rwxr-xr-x 1 root root   75752 Sep 23  2020 chown
+  -rwxr-xr-x 1 root root  157960 Sep 23  2020 cp
+  -rwxr-xr-x 1 root root  128724 Dec 11  2020 dash
+  -rwxr-xr-x 1 root root  124904 Sep 23  2020 date
+  -rwxr-xr-x 1 root root   92172 Sep 23  2020 dd
+  -rwxr-xr-x 1 root root  100752 Sep 23  2020 df
+  -rwxr-xr-x 1 root root  153964 Sep 23  2020 dir
+  -rwxr-xr-x 1 root root   83644 Feb  8  2021 dmesg
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 domainname -> hostname
+  -rwxr-xr-x 1 root root   34664 Sep 23  2020 echo
+  -rwxr-xr-x 1 root root      28 Nov 10  2020 egrep
+  -rwxr-xr-x 1 root root   34664 Sep 23  2020 false
+  -rwxr-xr-x 1 root root      28 Nov 10  2020 fgrep
+  -rwxr-xr-x 1 root root   71928 Feb  8  2021 findmnt
+  -rwsr-xr-x 1 root root   30112 Feb 27  2021 fusermount
+  -rwxr-xr-x 1 root root  210488 Nov 10  2020 grep
+  -rwxr-xr-x 2 root root    2346 Mar  3  2021 gunzip
+  -rwxr-xr-x 1 root root    6376 Mar  3  2021 gzexe
+  -rwxr-xr-x 1 root root  100952 Mar  3  2021 gzip
+  -rwxr-xr-x 1 root root   21916 Nov  8  2019 hostname
+  -rwxr-xr-x 1 root root   83980 Sep 23  2020 ln
+  -rwxr-xr-x 1 root root   55572 Feb  8  2020 login
+  -rwxr-xr-x 1 root root  153964 Sep 23  2020 ls
+  -rwxr-xr-x 1 root root  153124 Feb  8  2021 lsblk
+  -rwxr-xr-x 1 root root   96328 Sep 23  2020 mkdir
+  -rwxr-xr-x 1 root root   79912 Sep 23  2020 mknod
+  -rwxr-xr-x 1 root root   47048 Sep 23  2020 mktemp
+  -rwxr-xr-x 1 root root   58920 Feb  8  2021 more
+  -rwsr-xr-x 1 root root   50720 Feb  8  2021 mount
+  -rwxr-xr-x 1 root root   13856 Feb  8  2021 mountpoint
+  -rwxr-xr-x 1 root root  157996 Sep 23  2020 mv
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root      14 Apr 19  2021 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root   38824 Sep 23  2020 pwd
+  lrwxrwxrwx 1 root root       4 Feb 25  2021 rbash -> bash
+  -rwxr-xr-x 1 root root   46984 Sep 23  2020 readlink
+  -rwxr-xr-x 1 root root   75720 Sep 23  2020 rm
+  -rwxr-xr-x 1 root root   46984 Sep 23  2020 rmdir
+  -rwxr-xr-x 1 root root   22292 Sep 28  2020 run-parts
+  -rwxr-xr-x 1 root root  125036 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root       4 Jul 26 00:26 sh -> bash
+  lrwxrwxrwx 1 root root       4 Jul 25 05:46 sh.distrib -> dash
+  -rwxr-xr-x 1 root root   34696 Sep 23  2020 sleep
+  -rwxr-xr-x 1 root root   83880 Sep 23  2020 stty
+  -rwsr-xr-x 1 root root   79396 Feb  8  2021 su
+  -rwxr-xr-x 1 root root   34696 Sep 23  2020 sync
+  -rwxr-xr-x 1 root root  602584 Feb 17  2021 tar
+  -rwxr-xr-x 1 root root   13860 Sep 28  2020 tempfile
+  -rwxr-xr-x 1 root root  108520 Sep 23  2020 touch
+  -rwxr-xr-x 1 root root   34664 Sep 23  2020 true
+  -rwxr-xr-x 1 root root   17768 Feb 27  2021 ulockmgr_server
+  -rwsr-xr-x 1 root root   30236 Feb  8  2021 umount
+  -rwxr-xr-x 1 root root   34664 Sep 23  2020 uname
+  -rwxr-xr-x 2 root root    2346 Mar  3  2021 uncompress
+  -rwxr-xr-x 1 root root  153964 Sep 23  2020 vdir
+  -rwxr-xr-x 1 root root   63024 Feb  8  2021 wdctl
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root    1984 Mar  3  2021 zcat
+  -rwxr-xr-x 1 root root    1678 Mar  3  2021 zcmp
+  -rwxr-xr-x 1 root root    5880 Mar  3  2021 zdiff
+  -rwxr-xr-x 1 root root      29 Mar  3  2021 zegrep
+  -rwxr-xr-x 1 root root      29 Mar  3  2021 zfgrep
+  -rwxr-xr-x 1 root root    2081 Mar  3  2021 zforce
+  -rwxr-xr-x 1 root root    7585 Mar  3  2021 zgrep
+  -rwxr-xr-x 1 root root    2206 Mar  3  2021 zless
+  -rwxr-xr-x 1 root root    1842 Mar  3  2021 zmore
+  -rwxr-xr-x 1 root root    4553 Mar  3  2021 znew
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -327,7 +361,7 @@
 Get: 99 http://deb.debian.org/debian bullseye/main i386 subversion i386 1.14.1-3 [1007 kB]
 Get: 100 http://deb.debian.org/debian bullseye/main i386 time i386 1.9-0.1 [50.9 kB]
 Get: 101 http://deb.debian.org/debian bullseye/main i386 golang-github-chzyer-readline-dev all 1.4.39.g2972be2-1 [30.6 kB]
-Fetched 117 MB in 28s (4225 kB/s)
+Fetched 117 MB in 2s (54.1 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package bsdextrautils.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19675 files and directories currently installed.)
@@ -761,8 +795,44 @@
 Writing extended state information...
 Building tag database...
  -> Finished parsing the build-deps
+Reading package lists...
+Building dependency tree...
+Reading state information...
+The following additional packages will be installed:
+  libfile-find-rule-perl libnumber-compare-perl libtext-glob-perl
+The following NEW packages will be installed:
+  libfile-find-rule-perl libnumber-compare-perl libtext-glob-perl usrmerge
+0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
+Need to get 59.5 kB of archives.
+After this operation, 157 kB of additional disk space will be used.
+Get:1 http://deb.debian.org/debian bullseye/main i386 libnumber-compare-perl all 0.03-1.1 [6956 B]
+Get:2 http://deb.debian.org/debian bullseye/main i386 libtext-glob-perl all 0.11-1 [8888 B]
+Get:3 http://deb.debian.org/debian bullseye/main i386 libfile-find-rule-perl all 0.34-1 [30.6 kB]
+Get:4 http://deb.debian.org/debian bullseye/main i386 usrmerge all 25 [13.0 kB]
+debconf: delaying package configuration, since apt-utils is not installed
+Fetched 59.5 kB in 0s (4930 kB/s)
+Selecting previously unselected package libnumber-compare-perl.
+(Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 39707 files and directories currently installed.)
+Preparing to unpack .../libnumber-compare-perl_0.03-1.1_all.deb ...
+Unpacking libnumber-compare-perl (0.03-1.1) ...
+Selecting previously unselected package libtext-glob-perl.
+Preparing to unpack .../libtext-glob-perl_0.11-1_all.deb ...
+Unpacking libtext-glob-perl (0.11-1) ...
+Selecting previously unselected package libfile-find-rule-perl.
+Preparing to unpack .../libfile-find-rule-perl_0.34-1_all.deb ...
+Unpacking libfile-find-rule-perl (0.34-1) ...
+Selecting previously unselected package usrmerge.
+Preparing to unpack .../archives/usrmerge_25_all.deb ...
+Unpacking usrmerge (25) ...
+Setting up libtext-glob-perl (0.11-1) ...
+Setting up libnumber-compare-perl (0.03-1.1) ...
+Setting up libfile-find-rule-perl (0.34-1) ...
+Setting up usrmerge (25) ...
+The system has been successfully converted.
+Processing triggers for man-db (2.9.4-2) ...
+Not building database; man-db/auto-update is not 'true'.
 I: Building the package
-I: Running cd /build/reposurgeon-4.25/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b
+I: Running cd /build/reposurgeon-4.25/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b
 dpkg-buildpackage: info: source package reposurgeon
 dpkg-buildpackage: info: source version 4.25-1
 dpkg-buildpackage: info: source distribution unstable
@@ -775,7 +845,7 @@
    debian/rules execute_after_dh_auto_clean
 make[1]: Entering directory '/build/reposurgeon-4.25'
 DH_INTERNAL_OPTIONS= dh_auto_clean
-	make -j10 clean
+	make -j18 clean
 make[2]: Entering directory '/build/reposurgeon-4.25'
 rm -f reposurgeon repotool repomapper repocutter surgeon/version.go
 rm -fr docinclude *~ *.1 *.html *.tar.xz MANIFEST *.md5
@@ -808,162 +878,162 @@
 make[1]: Leaving directory '/build/reposurgeon-4.25'
    dh_auto_build -O--builddirectory=_build -O--buildsystem=golang
 warning: ignoring symlink /build/reposurgeon-4.25/_build/src/gitlab.com/esr/reposurgeon/vendor
-	cd _build && go install -trimpath -v -p 10 gitlab.com/esr/reposurgeon/cutter gitlab.com/esr/reposurgeon/mapper gitlab.com/esr/reposurgeon/surgeon gitlab.com/esr/reposurgeon/tool
+	cd _build && go install -trimpath -v -p 18 gitlab.com/esr/reposurgeon/cutter gitlab.com/esr/reposurgeon/mapper gitlab.com/esr/reposurgeon/surgeon gitlab.com/esr/reposurgeon/tool
+encoding
+golang.org/x/text/encoding/internal/identifier
 internal/unsafeheader
+unicode/utf16
+golang.org/x/text/internal/utf8internal
+sync/atomic
 internal/race
+internal/cpu
+internal/nettrace
 golang.org/x/sys/internal/unsafeheader
+container/list
+runtime/internal/atomic
 unicode/utf8
+crypto/internal/subtle
 math/bits
+runtime/cgo
 unicode
-internal/nettrace
-encoding
-internal/cpu
 runtime/internal/sys
-sync/atomic
-runtime/internal/atomic
-unicode/utf16
-golang.org/x/text/encoding/internal/identifier
-math
-container/list
-golang.org/x/text/internal/utf8internal
-internal/testlog
-runtime/internal/math
-crypto/internal/subtle
-runtime/cgo
-crypto/subtle
 vendor/golang.org/x/crypto/cryptobyte/asn1
 vendor/golang.org/x/crypto/internal/subtle
+crypto/subtle
 internal/bytealg
+runtime/internal/math
+internal/testlog
+math
 runtime
-sync
 internal/reflectlite
+sync
 internal/singleflight
 math/rand
 errors
 sort
 internal/oserror
-strconv
-vendor/golang.org/x/net/dns/dnsmessage
 io
+vendor/golang.org/x/net/dns/dnsmessage
+strconv
 syscall
 container/heap
 hash
-strings
 crypto/internal/randutil
-bytes
-crypto/rc4
 text/tabwriter
-reflect
-crypto/hmac
-crypto
+strings
+bytes
 hash/crc32
+crypto/hmac
 vendor/golang.org/x/crypto/hkdf
+crypto/rc4
+crypto
+reflect
+golang.org/x/text/transform
+vendor/golang.org/x/text/transform
+bufio
 regexp/syntax
-internal/syscall/execenv
 github.com/kballard/go-shellquote
 path
-internal/syscall/unix
-bufio
-time
-golang.org/x/text/transform
 html
-vendor/golang.org/x/text/transform
 golang.org/x/text/encoding
 golang.org/x/text/runes
 github.com/anmitsu/go-shlex
-regexp
 golang.org/x/text/encoding/internal
-context
 golang.org/x/text/encoding/unicode
 golang.org/x/text/encoding/korean
 golang.org/x/text/encoding/charmap
-golang.org/x/text/encoding/simplifiedchinese
 golang.org/x/text/encoding/traditionalchinese
 golang.org/x/text/encoding/japanese
+internal/syscall/unix
+golang.org/x/text/encoding/simplifiedchinese
+internal/syscall/execenv
+time
+regexp
+context
 internal/poll
 internal/fmtsort
-os
 encoding/binary
+os
 golang.org/x/text/encoding/ianaindex
-crypto/md5
 encoding/base64
-crypto/sha256
 crypto/sha512
-crypto/ed25519/internal/edwards25519
 crypto/sha1
+crypto/sha256
+crypto/md5
+vendor/golang.org/x/crypto/poly1305
+golang.org/x/sys/unix
+crypto/ed25519/internal/edwards25519
 crypto/cipher
-fmt
-path/filepath
 encoding/pem
+path/filepath
 os/signal
-golang.org/x/sys/unix
+runtime/debug
+fmt
+net
+crypto/des
 crypto/aes
 vendor/golang.org/x/crypto/chacha20
-vendor/golang.org/x/crypto/poly1305
-crypto/des
-io/ioutil
-net
-runtime/debug
 os/exec
+io/ioutil
 vendor/golang.org/x/crypto/chacha20poly1305
 log
-flag
 mime
-os/user
 encoding/hex
 compress/flate
-encoding/json
-github.com/emirpasic/gods/utils
+flag
+os/user
 gitlab.com/esr/reposurgeon/vendor/github.com/ianbruene/go-difflib/difflib
-gitlab.com/esr/reposurgeon/vendor/github.com/termie/go-shutil
+github.com/emirpasic/gods/utils
 runtime/trace
-github.com/emirpasic/gods/containers
-vendor/golang.org/x/crypto/curve25519
 net/url
-github.com/emirpasic/gods/lists
+vendor/golang.org/x/crypto/curve25519
+gitlab.com/esr/reposurgeon/vendor/github.com/termie/go-shutil
+encoding/json
 math/big
-compress/gzip
-vendor/golang.org/x/text/unicode/bidi
-github.com/emirpasic/gods/sets
-vendor/golang.org/x/text/unicode/norm
 vendor/golang.org/x/net/http2/hpack
+vendor/golang.org/x/text/unicode/norm
+vendor/golang.org/x/text/unicode/bidi
 mime/quotedprintable
+github.com/emirpasic/gods/containers
 net/http/internal
-golang.org/x/term
 text/template/parse
-github.com/emirpasic/gods/lists/doublylinkedlist
+github.com/emirpasic/gods/lists
+github.com/emirpasic/gods/sets
+compress/gzip
+golang.org/x/term
 vendor/golang.org/x/text/secure/bidirule
 internal/profile
-github.com/emirpasic/gods/sets/linkedhashset
 runtime/pprof
+github.com/emirpasic/gods/lists/doublylinkedlist
 golang.org/x/crypto/ssh/terminal
 gitlab.com/esr/reposurgeon/cutter
+text/template
 vendor/golang.org/x/net/idna
-crypto/elliptic
-encoding/asn1
-crypto/rand
+github.com/emirpasic/gods/sets/linkedhashset
 crypto/dsa
+crypto/rand
+encoding/asn1
+crypto/elliptic
 crypto/ed25519
 crypto/rsa
-vendor/golang.org/x/crypto/cryptobyte
+html/template
 crypto/x509/pkix
-text/template
-archive/tar
-github.com/xo/terminfo
+vendor/golang.org/x/crypto/cryptobyte
 crypto/ecdsa
-html/template
+github.com/xo/terminfo
+archive/tar
+vendor/golang.org/x/net/http/httpproxy
 net/textproto
 github.com/chzyer/readline
-vendor/golang.org/x/net/http/httpproxy
 crypto/x509
+net/mail
 vendor/golang.org/x/net/http/httpguts
 mime/multipart
-net/mail
 gitlab.com/esr/reposurgeon/mapper
 gitlab.com/esr/reposurgeon/vendor/gitlab.com/esr/fqme
 crypto/tls
-gitlab.com/esr/reposurgeon/tool
 gitlab.com/esr/reposurgeon/vendor/gitlab.com/ianbruene/kommandant
+gitlab.com/esr/reposurgeon/tool
 net/http/httptrace
 net/http
 net/http/pprof
@@ -989,12 +1059,12 @@
 make[1]: Leaving directory '/build/reposurgeon-4.25'
    dh_auto_test -O--builddirectory=_build -O--buildsystem=golang
 warning: ignoring symlink /build/reposurgeon-4.25/_build/src/gitlab.com/esr/reposurgeon/vendor
-	cd _build && go test -vet=off -v -p 10 gitlab.com/esr/reposurgeon/cutter gitlab.com/esr/reposurgeon/mapper gitlab.com/esr/reposurgeon/surgeon gitlab.com/esr/reposurgeon/tool
+	cd _build && go test -vet=off -v -p 18 gitlab.com/esr/reposurgeon/cutter gitlab.com/esr/reposurgeon/mapper gitlab.com/esr/reposurgeon/surgeon gitlab.com/esr/reposurgeon/tool
 === RUN   TestNameSequenceLength
 names = []string{"AmberAngel", "AmethystAxe", "ArgentAngel", "AmberBear", "AmethystAngel", "ArgentBear", "AmberAxe", "AmethystBear", "ArgentAxe", "AmberAngel1"}
 --- PASS: TestNameSequenceLength (0.00s)
 PASS
-ok  	gitlab.com/esr/reposurgeon/cutter	0.012s
+ok  	gitlab.com/esr/reposurgeon/cutter	0.002s
 ?   	gitlab.com/esr/reposurgeon/mapper	[no test files]
 === RUN   TestBackreferences
 --- PASS: TestBackreferences (0.00s)
@@ -1009,7 +1079,7 @@
 === RUN   TestHasReferences
 --- PASS: TestHasReferences (0.00s)
 === RUN   TestZoneFromEmail
---- PASS: TestZoneFromEmail (0.01s)
+--- PASS: TestZoneFromEmail (0.00s)
 === RUN   TestEmptyComment
 --- PASS: TestEmptyComment (0.00s)
 === RUN   TestReadMessage
@@ -1027,7 +1097,7 @@
 === RUN   TestChangelogParseAttribution
 --- PASS: TestChangelogParseAttribution (0.00s)
 === RUN   TestRemapAttribution
---- PASS: TestRemapAttribution (0.05s)
+--- PASS: TestRemapAttribution (0.00s)
 === RUN   TestBlobfile
 --- PASS: TestBlobfile (0.00s)
 === RUN   TestBlobColor
@@ -1056,7 +1126,7 @@
 === RUN   TestBranchbase
 --- PASS: TestBranchbase (0.00s)
 === RUN   TestCapture
---- PASS: TestCapture (0.01s)
+--- PASS: TestCapture (0.00s)
 === RUN   TestSVNParse
 --- PASS: TestSVNParse (0.00s)
 === RUN   TestFastImportParse1
@@ -1068,7 +1138,7 @@
 === RUN   TestDelete
 --- PASS: TestDelete (0.00s)
 === RUN   TestResort
---- PASS: TestResort (0.01s)
+--- PASS: TestResort (0.00s)
 === RUN   TestRenumber
 --- PASS: TestRenumber (0.00s)
 === RUN   TestGetSetAttr
@@ -1175,8 +1245,8 @@
     --- PASS: TestContainingDir/5 (0.00s)
     --- PASS: TestContainingDir/4 (0.00s)
     --- PASS: TestContainingDir/1 (0.00s)
-    --- PASS: TestContainingDir/3 (0.00s)
     --- PASS: TestContainingDir/2 (0.00s)
+    --- PASS: TestContainingDir/3 (0.00s)
 === RUN   TestChangelogParse
 === RUN   TestChangelogParse/0
 === PAUSE TestChangelogParse/0
@@ -1190,14 +1260,14 @@
 === PAUSE TestChangelogParse/4
 === CONT  TestChangelogParse/0
 === CONT  TestChangelogParse/4
-=== CONT  TestChangelogParse/3
 === CONT  TestChangelogParse/2
+=== CONT  TestChangelogParse/3
 === CONT  TestChangelogParse/1
 --- PASS: TestChangelogParse (0.00s)
     --- PASS: TestChangelogParse/0 (0.00s)
+    --- PASS: TestChangelogParse/2 (0.00s)
     --- PASS: TestChangelogParse/4 (0.00s)
     --- PASS: TestChangelogParse/3 (0.00s)
-    --- PASS: TestChangelogParse/2 (0.00s)
     --- PASS: TestChangelogParse/1 (0.00s)
 === RUN   TestWalkManifests
 reposurgeon: path "patches/00list" to be deleted is missing
@@ -1207,7 +1277,7 @@
 reposurgeon: path "hotplug-ng/README" to be deleted is missing
 reposurgeon: path "hotplug-ng/nut-usbups.hotplug.in" to be deleted is missing
 reposurgeon: path "hotplug-ng/nut-usbups.rules.in" to be deleted is missing
---- PASS: TestWalkManifests (0.18s)
+--- PASS: TestWalkManifests (0.06s)
 === RUN   TestFilterRegex
 === RUN   TestFilterRegex/0-safe-dft-sub-every-aborts
 reposurgeon: cannot transform blobs and nonblobs in same command
@@ -1222,445 +1292,438 @@
 === RUN   TestFilterRegex/9-unsafe-bref-every
 === RUN   TestFilterRegex/10-bref-dft-comment
 === RUN   TestFilterRegex/11-bref-explicit-first
---- PASS: TestFilterRegex (0.08s)
+--- PASS: TestFilterRegex (0.01s)
     --- PASS: TestFilterRegex/0-safe-dft-sub-every-aborts (0.00s)
     --- PASS: TestFilterRegex/1-unsafe-dft-first-every (0.00s)
     --- PASS: TestFilterRegex/2-unsafe-sub-every (0.00s)
     --- PASS: TestFilterRegex/3-dft-first-in-comment (0.00s)
     --- PASS: TestFilterRegex/4-explicit-first-in-comment-c1 (0.00s)
-    --- PASS: TestFilterRegex/5-explicit-first-in-comment-1c (0.02s)
+    --- PASS: TestFilterRegex/5-explicit-first-in-comment-1c (0.00s)
     --- PASS: TestFilterRegex/6-two-in-comment (0.00s)
-    --- PASS: TestFilterRegex/7-dft-first-in-committer (0.01s)
-    --- PASS: TestFilterRegex/8-committer-every (0.01s)
-    --- PASS: TestFilterRegex/9-unsafe-bref-every (0.02s)
-    --- PASS: TestFilterRegex/10-bref-dft-comment (0.01s)
-    --- PASS: TestFilterRegex/11-bref-explicit-first (0.01s)
+    --- PASS: TestFilterRegex/7-dft-first-in-committer (0.00s)
+    --- PASS: TestFilterRegex/8-committer-every (0.00s)
+    --- PASS: TestFilterRegex/9-unsafe-bref-every (0.00s)
+    --- PASS: TestFilterRegex/10-bref-dft-comment (0.00s)
+    --- PASS: TestFilterRegex/11-bref-explicit-first (0.00s)
 PASS
-ok  	gitlab.com/esr/reposurgeon/surgeon	0.452s
+ok  	gitlab.com/esr/reposurgeon/surgeon	0.089s
 ?   	gitlab.com/esr/reposurgeon/tool	[no test files]
    debian/rules execute_after_dh_auto_test
 make[1]: Entering directory '/build/reposurgeon-4.25'
 /usr/bin/make -k -C test --quiet check BINDIR=/build/reposurgeon-4.25
 make[2]: Entering directory '/build/reposurgeon-4.25/test'
-Running with 10 threads.
+Running with 18 threads.
 1..449
+ok - binary.svn: One commit with one byte of binary content.
 ok - bad-author.svn: Full DVCS-style ID in a Subversion author property
  reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
-ok - binary.svn: One commit with one byte of binary content.
-ok - blob-id.svn: Test case for use of legacy ID after blob creation
 ok - authortz.svn: Check that changelog TZ attributions don't step on author tz
+ok - blob-id.svn: Test case for use of legacy ID after blob creation
 ok - attrws.svn: Test whitespace canonicalization in Changelog attribution lines
-ok - adventitious.svn: Branchy repo with adventitious branch at top level
-ok - agito.svn: Simon Howard's tag-mangling test case
 ok - branchmap.svn: Test load for --branchify option and branch rename.
-ok - badattrib.svn: Test for changelog attribution that should be ignored
+ok - agito.svn: Simon Howard's tag-mangling test case
 ok - branchify.svn: test of the branchify command
-ok - cherry-pick.svn: Cherry-picks should not be translated as merges
+ok - adventitious.svn: Branchy repo with adventitious branch at top level
 ok - cvstag.svn: Test reduction of junk tags
-ok - branch-drop-add.svn: Branch drop-add test
-ok - badattrib2.svn: Clashing author lines in Changelog cause fallback to committer
+ok - badattrib.svn: Test for changelog attribution that should be ignored
+ok - cherry-pick.svn: Cherry-picks should not be translated as merges
 ok - deletion.svn: Tests translation of file deletions
-ok - delref.svn: Test ref deletion
 ok - emptybranch.svn: Branchy repo with empty branch at top level
-ok - delete-rename.svn: Stability test for yet another delete-rename case
-ok - delref2.svn: Test ref deletion with --preserve
-ok - delignore.svn: Tests correct cleanup of gitignore on directory delete
 ok - dircopyprop.svn: Test directory copy and property change in same revision
+ok - delref.svn: Test ref deletion
+ok - delref2.svn: Test ref deletion with --preserve
+ok - badattrib2.svn: Clashing author lines in Changelog cause fallback to committer
+ok - evil-blob.svn: Test clash between symlink special form and identical content.
 ok - co-authors.svn: Demonstrate GCC-style co-author parsing in ChangeLogs
+ok - delete-rename.svn: Stability test for yet another delete-rename case
 ok - deepdirs.svn: Branchy repo with directory copy and delete
-ok - evil-blob.svn: Test clash between symlink special form and identical content.
-ok - format7.svn: Dump containing a format 7 empty node
-ok - debranch.svn: Multibranch repo to test the debranch feature.
+ok - delignore.svn: Tests correct cleanup of gitignore on directory delete
 ok - expunge.svn: Test the expunge command on a nonstandard directory layout
-ok - emptycommit-merge.svn: Test if emptycommits can be the target of a merge
 ok - global-ignores.svn: svn:global-ignores property-setting example
+ok - branch-drop-add.svn: Branch drop-add test
+ok - emptycommit-merge.svn: Test if emptycommits can be the target of a merge
 ok - global-ignores-copy.svn: svn:global-ignores property-setting example
+ok - format7.svn: Dump containing a format 7 empty node
+ok - ignore.svn: svn:ignore property-setting example
+ok - ignore-copy.svn: svn:ignore property-setting example
+ok - ignore-blank.svn: Test svn:ignores including blank lines
 ok - fleetwood.svn: Test tag-move-retag sequence
  reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
-ok - ignore-copy.svn: svn:ignore property-setting example
+ok - debranch.svn: Multibranch repo to test the debranch feature.
+ok - lint.svn: Test load intended to trigger lint messages
 ok - filecopy.svn: Test to make sure file copies don't confuse branch detection
-ok - ignore-blank.svn: Test svn:ignores including blank lines
-ok - ignore.svn: svn:ignore property-setting example
 ok - gitify.svn: Test for the gitify command to canonicalize comments.
 ok - branchreplace.svn: Test handling of mid-branch delete
-ok - lint.svn: Test load intended to trigger lint messages
 ok - gitignore.svn: Subversion repo containing an explicit .gitignore
  reposurgeon: r4~trunk/.gitignore: user-created .gitignore ignored.
  reposurgeon: r5~branches/cool-feature/.gitignore: user-created .gitignore ignored.
 ok - emptyfrom.svn: Example repo with an empty from set on a copy
 ok - executable.svn: Test retention of executable bit.
-ok - mergeinfo-grandparent.svn: Merge from grandparent of branch, not direct parent
 ok - mixedbranch.svn: Test translation of pathological mixed-branch commits.
-ok - mergeinfo-combine.svn: Test sort/combine of ranges in mergeinfo properties
+ok - nesting.svn: Test subversion tags nested below the root
 ok - mergeinfo-trunkstomp.svn:  Merges across deletion and recreation of trunk
-ok - mergeinfo-manual.svn: Manually specifying revisions in merge is detected
+ok - node-kind-first.svn: Node-kind first as sometimes produced by svndumpfilter
 ok - mkignore.svn: Test simultaneous directory creation and ignore setting
-ok - mergeinfo-fork-delete.svn: Test merge detection by fork on branch deletes
-ok - nesting.svn: Test subversion tags nested below the root
+ok - mergeinfo-combine.svn: Test sort/combine of ranges in mergeinfo properties
 ok - mixedbranchlift.svn: Mixed-directory commits on master for testing branchlift
-ok - mergeinfo-with-split.svn: Test processing of mergeinfo with split commits
-ok - node-kind-first.svn: Node-kind first as sometimes produced by svndumpfilter
+ok - mergeinfo-grandparent.svn: Merge from grandparent of branch, not direct parent
 ok - pangram.svn: Flat repo with just one file commit and no directories
  reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
-ok - no-merge.svn: Test if split commits are sources of spurious merges
 ok - no-forward-merge.svn: Dubious mergeinfo shouldn't become forward merges
  reposurgeon: Ignoring bogus mergeinfo trying to create a forward merge
+ok - mergeinfo-manual.svn: Manually specifying revisions in merge is detected
 ok - nullignores.svn: Test handling of generated and user-created ignores
+ok - no-merge.svn: Test if split commits are sources of spurious merges
+ok - mergeinfo-with-split.svn: Test processing of mergeinfo with split commits
+ok - replace-dir.svn: Test directory replace operations
 ok - permcopy2.svn: Test for execute-bit propagation during directory copies.
-ok - permcopy1.svn: Test correct ancestry checking when setting file permissions
+ok - rootfirst.svn: No branches, first commit is on root
 ok - permcopy3.svn: Verify that permissions aren't lost in complex copies (#1)
-ok - nontipcopy.svn: Two branches, with the creation right after a tag copy
-ok - replace-dir.svn: Test directory replace operations
+ok - mergeinfo-fork-delete.svn: Test merge detection by fork on branch deletes
 ok - rootfile.svn: Branchy layout with a file at the root level
  reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
-ok - mergeinfo.svn: Test processing of Subversion mergeinfo properties
-ok - rootfirst.svn: No branches, first commit is on root
-ok - snarl.svn: Reproduce a Subversion copy case, testing lookback code.
-ok - multigen.svn: Multi-project repository example
+ok - nontipcopy.svn: Two branches, with the creation right after a tag copy
+ok - permcopy1.svn: Test correct ancestry checking when setting file permissions
+ok - myers1.svn: Test correctess of directory-replacement operation.
 ok - smallref.svn: Tiny repo for testing reference-cookie substitution
 ok - split-root.svn: Test split commit with part not on any declared branch
  reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
-ok - myers1.svn: Test correctess of directory-replacement operation.
-ok - simpletag.svn: Standard layout. Linear. A couple of tags and no branches
-ok - svnignores.svn: Translation of svn:ignore to .gitignores 
- reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
 ok - subclipse.svn: Test delete-and-replace produced by subclipse user
+ok - snarl.svn: Reproduce a Subversion copy case, testing lookback code.
+ok - simpletag.svn: Standard layout. Linear. A couple of tags and no branches
+ok - mergeinfo.svn: Test processing of Subversion mergeinfo properties
+ok - permcopy4.svn: Verify that permissions aren't lost in complex copies (#2)
 ok - split-dir.svn: Test commit splitting by filepath
 ok - samplebranch.svn: Two-branch history with interleaved commits
-ok - permcopy4.svn: Verify that permissions aren't lost in complex copies (#2)
+ok - svnignores.svn: Translation of svn:ignore to .gitignores 
+ reposurgeon: histories of files in the root directory have been put on branch refs/heads/unbranched
+ok - multigen.svn: Multi-project repository example
+ok - symlink.svn: Test prefix stripping for creation/modification of symlink
 ok - subdir.svn: Test mapping of Subversion branches in subdirectories.
-ok - tagsimple.svn: Test tag created in SVN with simple directory copy
 ok - squash-id.svn: Test case for use of legacy ID after squash --delete
-ok - symlink.svn: Test prefix stripping for creation/modification of symlink
-ok - tagsimpledelete.svn: Test tag created with directory copy, deleted & recreated
-ok - tagpollute.svn: Creation of tag followd by partial tag overwrite
+ok - svncheck4: Test property propagation over directory copies
+ok - tagsimple.svn: Test tag created in SVN with simple directory copy
 ok - tagdoublet.svn: tag doublet example
-ok - trunkstomp.svn: Trunk delete followed by copy from before delete should work
-ok - vanilla.svn: Standard layout. Linear. Simplest case, no tags or branches
-ok - vanilla-2file.svn: Standard layout, no tags or branches. 2 files
+ok - utf8.fi: git extractor round-tripping
+ok - tagpollute.svn: Creation of tag followd by partial tag overwrite
+ok - testrepo2.fi: git extractor round-tripping
+ok - tagsimpledelete.svn: Test tag created with directory copy, deleted & recreated
 ok - svncheck1: Test propagation of executable bit by copy to file with rename
-ok - svncheck4: Test property propagation over directory copies
 ok - svncheck3: Test propagation of executable bit by directory copy, second variant
-ok - svncheck2: Test propagation of executable bit by directory copy
-ok - utf8.fi: git extractor round-tripping
+ok - vanilla.svn: Standard layout. Linear. Simplest case, no tags or branches
+ok - trunkstomp.svn: Trunk delete followed by copy from before delete should work
 ok - wrong-mergeinfo.svn: Test graceful ignore of egregious mergeinfo
  reposurgeon: Ignoring bogus mergeinfo trying to create a forward merge
+ok - vanilla-2file.svn: Standard layout, no tags or branches. 2 files
+ok - svncheck2: Test propagation of executable bit by directory copy
+ok - bs.fi: git extractor round-tripping
 ok - svncheck0: General test load for ancestry-chasing logic
-ok - testrepo2.fi: git extractor round-tripping
 ok - testrepo2.fi: hg extractor
-ok - bs.fi: git extractor round-tripping
-ok - bb-alt.fi: hg extractor round-tripping
-ok - be-subrepo.fi: hg extractor round-tripping
 ok - treecontents.svn: SVN testcase for tree contents of branch roots
-ok - bb.fi: hg extractor round-tripping
-ok - be-subrepo2.fi: hg extractor round-tripping
-ok - be.fi: hg extractor round-tripping
-ok - be2.fi: hg extractor round-tripping
-ok - bt.fi: hg extractor round-tripping
-ok - be-bookmarks.fi: hg extractor round-tripping
-ok - be4.fi: hg extractor round-tripping
+ok - vendorbranch.svn: Strange example of vendor branching in Subversion.
 ok - bb-alt.fi compressed roundtrip
 ok - bb.fi compressed roundtrip
+ok - bb-alt.fi: hg extractor round-tripping
 ok - be-bookmarks.fi compressed roundtrip
-ok - be-subrepo.fi compressed roundtrip
 ok - be-subrepo2.fi compressed roundtrip
+ok - be-subrepo.fi compressed roundtrip
 ok - be.fi compressed roundtrip
 ok - be2.fi compressed roundtrip
 ok - be3.fi compressed roundtrip
 ok - be4.fi compressed roundtrip
 ok - be5.fi compressed roundtrip
 ok - be6.fi compressed roundtrip
-ok - be5.fi: hg extractor round-tripping
+ok - be-subrepo.fi: hg extractor round-tripping
 ok - bs.fi compressed roundtrip
 ok - bt.fi compressed roundtrip
 ok - bt2.fi compressed roundtrip
-ok - bt3.fi compressed roundtrip
 ok - bt3-local.fi compressed roundtrip
-ok - bzr.fi compressed roundtrip
 ok - commit-expunge.fi compressed roundtrip
-ok - deleteall.fi compressed roundtrip
+ok - bzr.fi compressed roundtrip
+ok - bt3.fi compressed roundtrip
+ok - be.fi: hg extractor round-tripping
 ok - debranch3.fi compressed roundtrip
+ok - deleteall.fi compressed roundtrip
 ok - discard-deleteall.fi compressed roundtrip
-ok - implicit.fi compressed roundtrip
-ok - be3.fi: hg extractor round-tripping
 ok - inline-simple.fi compressed roundtrip
 ok - liftlog.fi compressed roundtrip
 ok - lighttag.fi compressed roundtrip
-ok - min.fi compressed roundtrip
-ok - multitag.fi compressed roundtrip
 ok - reorder.fi compressed roundtrip
-ok - sample1.fi compressed roundtrip
+ok - multitag.fi compressed roundtrip
+ok - min.fi compressed roundtrip
 ok - roundup.fi compressed roundtrip
+ok - sample1.fi compressed roundtrip
 ok - sample2.fi compressed roundtrip
+ok - bb.fi: hg extractor round-tripping
 ok - sample4.fi compressed roundtrip
 ok - sample3.fi compressed roundtrip
 ok - simple.fi compressed roundtrip
+ok - tagify.fi compressed roundtrip
 ok - testrepo.fi compressed roundtrip
 ok - svnfodder.fi compressed roundtrip
-ok - tagify.fi compressed roundtrip
-ok - testrepo2.fi compressed roundtrip
-ok - uncoalesced.fi compressed roundtrip
 ok - utf8.fi compressed roundtrip
-ok - bb-alt.fi message-box roundtripping
+ok - testrepo2.fi compressed roundtrip
+ok - implicit.fi compressed roundtrip
 ok - bb.fi message-box roundtripping
+ok - bb-alt.fi message-box roundtripping
+ok - be-subrepo.fi message-box roundtripping
 ok - be-bookmarks.fi message-box roundtripping
 ok - be-subrepo2.fi message-box roundtripping
-ok - be-subrepo.fi message-box roundtripping
+ok - uncoalesced.fi compressed roundtrip
 ok - be.fi message-box roundtripping
+ok - be4.fi message-box roundtripping
 ok - be2.fi message-box roundtripping
 ok - be3.fi message-box roundtripping
-ok - be4.fi message-box roundtripping
 ok - be5.fi message-box roundtripping
 ok - be6.fi message-box roundtripping
-ok - bs.fi message-box roundtripping
+ok - bt2.fi message-box roundtripping
 ok - bt.fi message-box roundtripping
 ok - bt3-local.fi message-box roundtripping
-ok - bt2.fi message-box roundtripping
+ok - bs.fi message-box roundtripping
 ok - bt3.fi message-box roundtripping
 ok - bzr.fi message-box roundtripping
 ok - commit-expunge.fi message-box roundtripping
-ok - deleteall.fi message-box roundtripping
 ok - debranch3.fi message-box roundtripping
-ok - discard-deleteall.fi message-box roundtripping
+ok - deleteall.fi message-box roundtripping
 ok - inline-simple.fi message-box roundtripping
+ok - lighttag.fi message-box roundtripping
+ok - discard-deleteall.fi message-box roundtripping
 ok - liftlog.fi message-box roundtripping
-ok - implicit.fi message-box roundtripping
 ok - min.fi message-box roundtripping
-ok - lighttag.fi message-box roundtripping
 ok - multitag.fi message-box roundtripping
 ok - reorder.fi message-box roundtripping
 ok - roundup.fi message-box roundtripping
-ok - sample1.fi message-box roundtripping
-ok - sample3.fi message-box roundtripping
-ok - sample2.fi message-box roundtripping
 ok - sample4.fi message-box roundtripping
-ok - simple.fi message-box roundtripping
-ok - svnfodder.fi message-box roundtripping
+ok - sample2.fi message-box roundtripping
+ok - sample3.fi message-box roundtripping
+ok - sample1.fi message-box roundtripping
 ok - tagify.fi message-box roundtripping
-ok - testrepo2.fi message-box roundtripping
+ok - svnfodder.fi message-box roundtripping
 ok - testrepo.fi message-box roundtripping
-ok - uncoalesced.fi message-box roundtripping
+ok - simple.fi message-box roundtripping
+ok - testrepo2.fi message-box roundtripping
 ok - utf8.fi message-box roundtripping
 ok - Test the add primitive
-ok - Test append command
 ok - Test argument substitution in a script call
 ok - Test the assignment command
+ok - uncoalesced.fi message-box roundtripping
 ok - Test attribution manipulation
-ok - Whitespace in changelog attribution linees nust be canonicalized
-ok - Regression test authors write format
+ok - implicit.fi message-box roundtripping
+ok - Test append command
 ok - Test matching on author name
-ok - Check that deduction of commtter TZ doesn't leak.
+ok - be-subrepo2.fi: hg extractor round-tripping
 ok - Test relocation of blobs when a fileop is moved backwards.
+ok - Regression test authors write format
 ok - Test backreference substitution in filter regexp
-ok - Test for attribution not being incorrectly carried to a branch
+ok - Whitespace in changelog attribution linees nust be canonicalized
 ok - Bad from-rev in file with discontiguous revisions
-ok - Test for attribution not being incorrectly carried to a branch
 ok - Test recovery from malformed search
+ok - Test for attribution not being incorrectly carried to a branch
+ok - Check that deduction of commtter TZ doesn't leak.
 ok - Test the branch delete command
 ok - Patch a synthetic blob into a repository
-ok - Test use of legacy IDs after a blob command
-ok - be6.fi: hg extractor round-tripping
-ok - bt2.fi: hg extractor round-tripping
 ok - Test the branch delete command with a regexp argument
+ok - Test for attribution not being incorrectly carried to a branch
+ok - Test use of legacy IDs after a blob command
+ok - Test dumping of partial repo with --noincremental
 ok - Test branchify option
 ok - Test branch-lifting primitive
-ok - Test branchify option and branch renamw
 ok - Test the rename branch command
-ok - Test dumping of partial repo with --noincremental
-ok - Test coalesce --changelog
-ok - Test Check-Text match and mismatch
 ok - Test graft using a root callout and no selection set
-ok - Test coalesce command
+ok - Test Check-Text match and mismatch
+ok - Test branchify option and branch renamw
 ok - Test expunge that deletes a commit
 ok - Test commit creation
-ok - Test of the debranch feature
-ok - Test interaction of debranch and path list
-ok - Test path modification of debranch
+ok - Test coalesce --changelog
+ok - bt.fi: hg extractor round-tripping
+ok - Test coalesce command
 ok - test the dedup function
+ok - Test path modification of debranch
+ok - Test filter dedos
 ok - Test if delete command can delete all types of objects
+ok - Test of the debranch feature
 ok - Test if commands handling tree contents understand deleteall
 ok - Check that no branch or tag is lost by delete --tagback
-ok - Test filter dedos
-ok - Test drop command
 ok - Test diff
-ok - Check backreferences are dropped for ops before deletealls
 ok - Test errors parsing and evaluating disjunctions
+ok - bt3.fi: hg extractor round-tripping
+ok - Check backreferences are dropped for ops before deletealls
 ok - Test topological-divide and renumber operations
+ok - Test interaction of debranch and path list
+ok - Test drop command
 ok - Test @dsc recursive-descendant operation
 ok - Test --empty modifier on msgin
 ok - Test file expunge operation
+ok - Test of the graft feature
+ok - Test of the graft --prune feature
 ok - Test for the gitify command to canonicalize comments.
-ok - Test content filtering
 ok - Test conversion of explicit global-ignores properties
 ok - Test using only in-tree .gitignore when asked to
-ok - Test conversion of explicit global-ignores properties
-ok - Test of the graft --prune feature
-ok - Test of the graft feature
+ok - bt2.fi: hg extractor round-tripping
+ok - Test msgout --filter option
 ok - Second test of the graft feature
+ok - Test conversion of explicit global-ignores properties
 ok - Rest graph-generation code
-ok - Test msgout --filter option
 ok - Test =I and transcode
-ok - Test conversion of explicit ignore properties
-ok - Test conversion of explicit ignore properties
 ok - test ignore (defaults generation, rename, translation).
-ok - See the effects of fillin in implicit from links
 ok - Test incorporate command - after case with --firewall
 ok - Test incorporate command - before case with --firewall
+ok - bt3-local.fi: hg extractor round-tripping
 ok - Test incorporate command - after case
 ok - Test incorporate command - before case
+ok - Test conversion of explicit ignore properties
 ok - Test incorporate command with input redirect
+ok - Test conversion of explicit ignore properties
 ok - Expunge of inline file
+ok - Legacy-ID pattern-matching
 ok - Test mining authorship from Changelog
-ok - Test for correct side effects of lightweight tag deletion.
 ok - Lightweight tag renaming test
-ok - Legacy-ID pattern-matching
-ok - Make sure the lint command works
-ok - Test mixed-commit case of branchlift
+ok - Test for correct side effects of lightweight tag deletion.
+ok - Testing merge and unmerge commands
 ok - Test the macro facility
+ok - Test content filtering
 ok - Test msgout/msgin round-trip
-ok - Test robustness in the face of an ill-formed merginfo
-ok - Testing merge and unmerge commands
-ok - bt3.fi: hg extractor round-tripping
+ok - Test msgin adding author to commit
 ok - Test tag creation via msgin
 ok - Test combination with --tagback on a commit tagged twice
-ok - Test dissection of multiproject repo
-ok - Test conversion of multiproject repo
-ok - Test msgin adding author to commit
-ok - Test correct ordering of mixed-branch splits
+ok - See the effects of fillin in implicit from links
+ok - Make sure the lint command works
+ok - Test robustness in the face of an ill-formed merginfo
 ok - Test unite of multiple copies of a repo mapped to branches
-ok - Test subversion tags nested below the root
+ok - Test mixed-commit case of branchlift
 ok - Test strip --obscure
-ok - Demonstrate that revision numbers need not be contiguous
-ok - Tests of selection-set syntax and parser features
+ok - Test dissection of multiproject repo
+ok - Test conversion of multiproject repo
 ok - Test path rename capability with selection set
+ok - Test correct ordering of mixed-branch splits
+ok - be2.fi: hg extractor round-tripping
 ok - Test path rename capability
-ok - Test readlimit
-ok - Test the remove primitive
-ok - Test of strip blobs reduce command
+ok - Tests of selection-set syntax and parser features
 ok - test rename of a reset
+ok - Demonstrate that revision numbers need not be contiguous
+ok - Test of strip blobs reduce command
 ok - Test the renumber command
-ok - Test commit re-ordering
+ok - Test subversion tags nested below the root
+ok - Test the remove primitive
+ok - test creating new resets
 ok - Reparenting parents with inline data w/o tree preservation
 ok - Reset tests
-ok - Reparenting parents with and w/o tree preservation
-ok - bt3-local.fi: hg extractor round-tripping
-ok - test creating new resets
-ok - Test selection sets
 ok - Test squash --pushback
+ok - Test commit re-ordering
+ok - Test selection sets
+ok - Reparenting parents with and w/o tree preservation
 ok - Test nested script calls
-ok - Reference-cookie substitution
-ok - Test use of legacy IDs after a squash --delete
-ok - Test of index, tip, tags, history, paths, expunge and checkout
-ok - Split a commit based on a directory prefix
-ok - Test the split command
 ok - stamp command shouldn't fail while trimming text lines
-ok - Test of strip command
+ok - Test of index, tip, tags, history, paths, expunge and checkout
 ok - Test tag comment handling
-ok - Tag reference test
+ok - Test of strip command
 ok - Tag create test
-ok - Test of the tagify command
+ok - Test readlimit
+ok - Split a commit based on a directory prefix
+ok - Reference-cookie substitution
+ok - Test the split command
 ok - Tag move test
-ok - Test of tag deletion by regexp
+ok - Tag reference test
 ok - Test subdirectory branches
+ok - Test of the tagify command
 ok - Tag renaming test
+ok - Test use of legacy IDs after a squash --delete
 ok - Test the setfield-commitdate and timeoffset commands
-ok - Test retract and re-creation of branch tag.
-ok - Generated commits should have the correct tree
 ok - Test the timeoffset command
+ok - Test unite of 3 repositories
+ok - Test of the unite feature
+ok - Test matching non standard ASCII chars
 ok - Test of the unite feature with pruning
 ok - Trickier tag rename test
-ok - Test of the unite feature
-ok - Test unite of 3 repositories
+ok - Test retract and re-creation of branch tag.
+ok - Test of tag deletion by regexp
 ok - Test the --user-ignores option
-ok - Test matching non standard ASCII chars
 ok - Test Windows10/WSL line termination in message boxes
-ok - Test --write-legacy option
-ok - adventitious.svn: Branchy repo with adventitious branch at top level
+ok - Generated commits should have the correct tree
 ok - binary.svn: One commit with one byte of binary content.
-ok - branchreplace.svn: Test handling of mid-branch delete
-ok - co-authors.svn: Demonstrate GCC-style co-author parsing in ChangeLogs
-ok - branch-drop-add.svn: Branch drop-add test
 ok - bad-author.svn: Full DVCS-style ID in a Subversion author property
-ok - cherry-pick.svn: Cherry-picks should not be translated as merges
+ok - adventitious.svn: Branchy repo with adventitious branch at top level
 ok - agito.svn: Simon Howard's tag-mangling test case
+ok - branch-drop-add.svn: Branch drop-add test
+ok - branchreplace.svn: Test handling of mid-branch delete
+ok - co-authors.svn: Demonstrate GCC-style co-author parsing in ChangeLogs
 ok - cvstag.svn: Test reduction of junk tags
-ok - deletion.svn: Tests translation of file deletions
-ok - delref.svn: Test ref deletion
+ok - Test --write-legacy option
+ok - cherry-pick.svn: Cherry-picks should not be translated as merges
 ok - deepdirs.svn: Branchy repo with directory copy and delete
-ok - delref2.svn: Test ref deletion with --preserve
+ok - delref.svn: Test ref deletion
 ok - delete-rename.svn: Stability test for yet another delete-rename case
 ok - delignore.svn: Tests correct cleanup of gitignore on directory delete
 ok - dircopyprop.svn: Test directory copy and property change in same revision
-ok - emptybranch.svn: Branchy repo with empty branch at top level
+ok - deletion.svn: Tests translation of file deletions
+ok - delref2.svn: Test ref deletion with --preserve
 ok - emptycommit-merge.svn: Test if emptycommits can be the target of a merge
+ok - emptybranch.svn: Branchy repo with empty branch at top level
 ok - emptyfrom.svn: Example repo with an empty from set on a copy
 ok - evil-blob.svn: Test clash between symlink special form and identical content.
 ok - executable.svn: Test retention of executable bit.
+ok - ignore-blank.svn: Test svn:ignores including blank lines
 ok - filecopy.svn: Test to make sure file copies don't confuse branch detection
-ok - mergeinfo-fork-delete.svn: Test merge detection by fork on branch deletes
-ok - format7.svn: Dump containing a format 7 empty node
-ok - fleetwood.svn: Test tag-move-retag sequence
 ok - gitignore.svn: Subversion repo containing an explicit .gitignore
-ok - ignore-blank.svn: Test svn:ignores including blank lines
+ok - fleetwood.svn: Test tag-move-retag sequence
+ok - format7.svn: Dump containing a format 7 empty node
 ok - mergeinfo-combine.svn: Test sort/combine of ranges in mergeinfo properties
 ok - mergeinfo-grandparent.svn: Merge from grandparent of branch, not direct parent
 ok - mergeinfo-trunkstomp.svn:  Merges across deletion and recreation of trunk
-ok - mixedbranch.svn: Test translation of pathological mixed-branch commits.
-ok - mergeinfo-with-split.svn: Test processing of mergeinfo with split commits
+ok - mergeinfo-fork-delete.svn: Test merge detection by fork on branch deletes
 ok - mergeinfo-manual.svn: Manually specifying revisions in merge is detected
-ok - mergeinfo.svn: Test processing of Subversion mergeinfo properties
+ok - mergeinfo-with-split.svn: Test processing of mergeinfo with split commits
 ok - myers1.svn: Test correctess of directory-replacement operation.
 ok - mkignore.svn: Test simultaneous directory creation and ignore setting
+ok - mixedbranch.svn: Test translation of pathological mixed-branch commits.
+ok - mergeinfo.svn: Test processing of Subversion mergeinfo properties
 ok - no-merge.svn: Test if split commits are sources of spurious merges
-ok - pangram.svn: Flat repo with just one file commit and no directories
-ok - no-forward-merge.svn: Dubious mergeinfo shouldn't become forward merges
 ok - nontipcopy.svn: Two branches, with the creation right after a tag copy
-ok - nullignores.svn: Test handling of generated and user-created ignores
+ok - no-forward-merge.svn: Dubious mergeinfo shouldn't become forward merges
 ok - node-kind-first.svn: Node-kind first as sometimes produced by svndumpfilter
-ok - nut.svn: Test lifting of legacy references
-ok - rootfile.svn: Branchy layout with a file at the root level
-ok - permcopy2.svn: Test for execute-bit propagation during directory copies.
+ok - nullignores.svn: Test handling of generated and user-created ignores
+ok - pangram.svn: Flat repo with just one file commit and no directories
+ok - permcopy3.svn: Verify that permissions aren't lost in complex copies (#1)
 ok - permcopy4.svn: Verify that permissions aren't lost in complex copies (#2)
+ok - nut.svn: Test lifting of legacy references
 ok - replace-dir.svn: Test directory replace operations
 ok - rootfirst.svn: No branches, first commit is on root
+ok - simpletag.svn: Standard layout. Linear. A couple of tags and no branches
 ok - permcopy1.svn: Test correct ancestry checking when setting file permissions
-ok - permcopy3.svn: Verify that permissions aren't lost in complex copies (#1)
+ok - permcopy2.svn: Test for execute-bit propagation during directory copies.
+ok - be4.fi: hg extractor round-tripping
 ok - samplebranch.svn: Two-branch history with interleaved commits
-ok - simpletag.svn: Standard layout. Linear. A couple of tags and no branches
 ok - snarl.svn: Reproduce a Subversion copy case, testing lookback code.
 ok - split-root.svn: Test split commit with part not on any declared branch
+ok - rootfile.svn: Branchy layout with a file at the root level
+ok - symlink.svn: Test prefix stripping for creation/modification of symlink
 ok - subclipse.svn: Test delete-and-replace produced by subclipse user
-ok - svnignores.svn: Translation of svn:ignore to .gitignores 
+ok - tagdoublet.svn: tag doublet example
 ok - swap.svn: Test load for repocutter swap operation
-ok - symlink.svn: Test prefix stripping for creation/modification of symlink
-ok - tagpollute.svn: Creation of tag followd by partial tag overwrite
+ok - svnignores.svn: Translation of svn:ignore to .gitignores 
 ok - tagsimple.svn: Test tag created in SVN with simple directory copy
-ok - tagdoublet.svn: tag doublet example
+ok - tagpollute.svn: Creation of tag followd by partial tag overwrite
 ok - tagsimpledelete.svn: Test tag created with directory copy, deleted & recreated
-ok - trunkstomp.svn: Trunk delete followed by copy from before delete should work
-ok - vanilla-2file.svn: Standard layout, no tags or branches. 2 files
 ok - Test incomplete (-i) mode of repomapper
 ok - Test host suffixing in repomapper
-ok - Test processing of mergeinfo with split commits
-ok - Test lifting of legacy references
-ok - Test processing of additional maps in repomapper
 ok - Test password-file processing code in repomapper
-ok - wrong-mergeinfo.svn: Test graceful ignore of egregious mergeinfo
-ok - vanilla.svn: Standard layout. Linear. Simplest case, no tags or branches
 ok - vendorbranch.svn: Strange example of vendor branching in Subversion.
+ok - trunkstomp.svn: Trunk delete followed by copy from before delete should work
+ok - Test processing of additional maps in repomapper
 ok - Test mailbox analysis in repomapper
-ok - Test repotool checkout of CVS repo
-ok - Test repotool checkout of svn repo
+ok - vanilla-2file.svn: Standard layout, no tags or branches. 2 files
+ok - vanilla.svn: Standard layout. Linear. Simplest case, no tags or branches
+ok - wrong-mergeinfo.svn: Test graceful ignore of egregious mergeinfo
+ok - Test processing of mergeinfo with split commits
+ok - Test lifting of legacy references
 ok - Test repotool checkout of git repo at tag
 ok - Test repotool checkout of git repo
-ok - vendorbranch.svn: Strange example of vendor branching in Subversion.
-ok - Test detecting svn-to-git conversion failure
-ok - Test comparing master between svn and git repo
+ok - be6.fi: hg extractor round-tripping
 make[4]: *** [Makefile:275: repotool-test-repotool-export-cvs] Error 1
 not ok: cvs-fast-export missing. | SKIP
 not ok - repotool-export-cvs.chk: Test repotool export of CVS repo
  --- repotool-export-cvs.chk	2021-03-02 04:07:15.000000000 +0000
- +++ -	2021-06-22 03:06:29.286814998 +0000
+ +++ -	2022-07-25 10:27:48.250445668 +0000
  @@ -1,98 +1,3 @@
  -cvs-fast-export: no commitids before 2015-07-30T21:39:57Z.
  -#reposurgeon sourcetype cvs
@@ -1759,23 +1822,22 @@
  -reset refs/heads/master
  -from :8
  -
- +sh: 1: cvs-fast-export: not found
+ +sh: line 1: cvs-fast-export: command not found
  +repotool: executing "find . -name '*,v' -print | cvs-fast-export --reposurgeon": exit status 127
   done
-ok - Test comparing tag between svn and git repo
+ok - be5.fi: hg extractor round-tripping
 ok - Test repotool export of git repo
-ok - Test comparing branch between svn and git repo
-ok - Test repotool export of svn repo
+ok - be3.fi: hg extractor round-tripping
 ok - Test repotool initialize, cvs->git
 ok - Test repotool initialize, svn->git
 ok - Test repotool initialize, svn->hg
-sh: 1: cvssync: not found
-repotool: executing "cvssync -c -o /tmp/mirror11417 cvs://localhost/build/reposurgeon-4.25/test/hack1.repo#module": exit status 127
+sh: line 1: cvssync: command not found
+repotool: executing "cvssync -c -o /tmp/mirror47053 cvs://localhost/build/reposurgeon-4.25/test/hack1.repo#module": exit status 127
 make[4]: *** [Makefile:275: repotool-test-repotool-mirror-cvs] Error 1
 not ok: cvs-fast-export missing. | SKIP
 not ok - repotool-mirror-cvs.chk: Test repotool mirror of CVS repo
  --- repotool-mirror-cvs.chk	2021-03-02 04:07:18.000000000 +0000
- +++ -	2021-06-22 03:09:10.229613110 +0000
+ +++ -	2022-07-25 10:27:48.980926505 +0000
  @@ -1,98 +1 @@
  -cvs-fast-export: no commitids before 2015-07-30T21:39:57Z.
  -#reposurgeon sourcetype cvs
@@ -1875,53 +1937,61 @@
  -from :8
  -
  -done
- +repotool: unknown repository type at /tmp/mirror11417
-ok - Test comparing all named locations between svn & git repo
-ok - Test repotool mirror of git repo
+ +repotool: unknown repository type at /tmp/mirror47053
+ok - Test repotool checkout of CVS repo
+ok - Test repotool checkout of svn repo
 not ok: rsync missing. | SKIP
 not ok - repotool-mirror-rsync.sh: this test needs to be able to ssh to localhost, but that doesn't appear to be possible # SKIP
-ok - Test comparing tags between svn and git repo
-ok - Test repotool checkout of Mercurial repo
-ok - Test repotool checkout of Mercurial repo at tag
+ok - Test comparing master between svn and git repo
+ok - Test repotool export of svn repo
 ok - Test comparing tags between git and hg repo
 ok - Test listing tags in CVS repository
+ok - Test detecting svn-to-git conversion failure
 ok - Test repocutter handling of binary data in a log
 ok - Test that without modifiers it's a faithful copy
+ok - Test repotool mirror of git repo
 ok - Test deselection
 ok - Test path expunge with copyfrom excision
+ok - Test front selection
 ok - Test listing tags in git repository
 ok - Test log subcommand
-ok - Test front selection
 ok - Test patching of mergeinfo references in renumber
 ok - Test expensive copy with repocutter
-ok - Test obscuring of filenames
+ok - Test comparing tag between svn and git repo
 ok - Test path rename
-ok - Test reduce subcommand to topologically reduce a repo
 ok - Test path-seqment popping
+ok - Test reduce subcommand to topologically reduce a repo
 ok - Test renumbering and patching of copyfrom revisions
+ok - Test obscuring of filenames
 ok - Test replace subcommand to replace text in blobs
 ok - Test path sifting
 ok - Test strip subcommand to skeletonize selected paths
-ok - Test listing tags in svn repository
 ok - Test strip subcommand to skeletonize a repo
 ok - Test path-element swapping
 repotool: both repository directories must exist.
 not ok: cvs-fast-export missing. | SKIP
 make[5]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
-sh: 1: cvssync: not found
+sh: line 1: cvssync: command not found
 repotool: executing "cvssync -c -o hack1-mirror cvs://localhost/build/reposurgeon-4.25/test/hack1.repo#module": exit status 127
 make[5]: *** [Makefile:73: hack1-mirror] Error 1
 make[5]: Target 'default' not remade because of errors.
 not ok - workflow-cvs-git.sh: repositories do not compare equal.
 ok - workflow-cvs-git.sh: repositories compare equal
+ok - Test comparing tags between svn and git repo
 ok - hashcheck.sh: succeeded
-ok - Test repotool mirror of svn repo via svnsync
+ok - Test comparing all named locations between svn & git repo
+ok - Test comparing branch between svn and git repo
+ok - Test listing tags in svn repository
+ok - swap.svn: Test load for repocutter swap operation
 ok - Test listing tags in hg repository
-ok - workflow-svn-git.sh: repositories compared equal
 ok - Test listing closed branches in hg repository
+ok - Test repotool checkout of Mercurial repo
+ok - Test repotool checkout of Mercurial repo at tag
+ok - Test repotool mirror of svn repo via svnsync
+ok - workflow-svn-git.sh: repositories compared equal
+ok - be-bookmarks.fi: hg extractor round-tripping
 ok - Test repotool mirror of hg repo
 ok - Test repotool export of hg repo
-ok - swap.svn: Test load for repocutter swap operation
 ok - nut.svn: Test lifting of legacy references
 make[2]: Leaving directory '/build/reposurgeon-4.25/test'
 make[1]: Leaving directory '/build/reposurgeon-4.25'
@@ -1931,7 +2001,7 @@
    debian/rules override_dh_auto_install
 make[1]: Entering directory '/build/reposurgeon-4.25'
 DH_INTERNAL_OPTIONS= dh_auto_install -- prefix=/usr
-	make -j10 install DESTDIR=/build/reposurgeon-4.25/debian/reposurgeon AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr
+	make -j18 install DESTDIR=/build/reposurgeon-4.25/debian/reposurgeon AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr
 make[2]: Entering directory '/build/reposurgeon-4.25'
 install --strip-program=true -d "/build/reposurgeon-4.25/debian/reposurgeon/usr/bin"
 install: WARNING: ignoring --strip-program option as -s option was not specified
@@ -1970,10 +2040,10 @@
 dh_dwz: warning: Common issues include no debug information at all (missing -g) and
 dh_dwz: warning: compressed debug information (#931891).
    dh_strip -a -O--builddirectory=_build -O--buildsystem=golang
-dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/reposurgeon
-dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/repotool
 dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/repocutter
+dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/reposurgeon
 dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/repomapper
+dh_strip: warning: Could not find the BuildID in debian/reposurgeon/usr/bin/repotool
    dh_makeshlibs -a -O--builddirectory=_build -O--buildsystem=golang
    dh_shlibdeps -a -O--builddirectory=_build -O--buildsystem=golang
    dh_installdeb -O--builddirectory=_build -O--buildsystem=golang
@@ -1989,12 +2059,14 @@
  dpkg-source --after-build .
 dpkg-buildpackage: info: binary-only upload (no source included)
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/5336/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/15364 and its subdirectories
-I: Current time: Mon Jun 21 16:03:18 -12 2021
-I: pbuilder-time-stamp: 1624334599
+I: removing directory /srv/workspace/pbuilder/5336 and its subdirectories
+I: Current time: Tue Jul 26 00:28:10 +14 2022
+I: pbuilder-time-stamp: 1658744890