Diff of the two buildlogs:

--
--- b1/build.log	2025-08-24 14:07:30.007109198 +0000
+++ b2/build.log	2025-08-24 14:21:37.848116914 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sat Sep 26 08:22:59 -12 2026
-I: pbuilder-time-stamp: 1790454179
+I: Current time: Mon Aug 25 04:07:37 +14 2025
+I: pbuilder-time-stamp: 1756044457
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/forky-reproducible-base.tgz]
 I: copying local configuration
@@ -24,53 +24,85 @@
 dpkg-source: info: applying debian-changes
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/3522710/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink04-arm64.
+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
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Aug 24 14:07 /bin/sh -> /bin/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/1207369/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='forky'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=forky
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='79118b5f70234d7d93d2f881cdce33b8'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  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='3522710'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=2e9526f7880841b391f38cc9fccbe9e1
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-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=1207369
   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/r-b-build.KMCn129G/pbuilderrc_yyYZ --distribution forky --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.KMCn129G/b1 --logfile b1/build.log git-annex_10.20250721-1.dsc'
-  SUDO_GID='109'
-  SUDO_HOME='/var/lib/jenkins'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4: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/r-b-build.KMCn129G/pbuilderrc_bOLq --distribution forky --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.KMCn129G/b2 --logfile b2/build.log git-annex_10.20250721-1.dsc'
+  SUDO_GID=109
+  SUDO_HOME=/var/lib/jenkins
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink03-arm64 6.12.41+deb13-cloud-arm64 #1 SMP Debian 6.12.41-1 (2025-08-12) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.12.41+deb13-cloud-arm64 #1 SMP Debian 6.12.41-1 (2025-08-12) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Aug 10  2025 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/3522710/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Aug 10 12:30 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -701,7 +733,7 @@
 Get: 399 http://deb.debian.org/debian forky/main arm64 libghc-yesod-form-dev arm64 1.7.6-2+b3 [468 kB]
 Get: 400 http://deb.debian.org/debian forky/main arm64 libghc-yesod-dev arm64 1.6.2.1-3+b3 [108 kB]
 Get: 401 http://deb.debian.org/debian forky/main arm64 libghc-yesod-static-dev arm64 1.6.1.0-4+b3 [218 kB]
-Fetched 201 MB in 1s (191 MB/s)
+Fetched 201 MB in 2s (92.0 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libgmpxx4ldbl:arm64.
 (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 ... 19969 files and directories currently installed.)
@@ -2337,7 +2369,11 @@
 fakeroot is already the newest version (1.37.1.2-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/reproducible-path/git-annex-10.20250721/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../git-annex_10.20250721-1_source.changes
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for forky
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-annex-10.20250721/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../git-annex_10.20250721-1_source.changes
 dpkg-buildpackage: info: source package git-annex
 dpkg-buildpackage: info: source version 10.20250721-1
 dpkg-buildpackage: info: source distribution unstable
@@ -2375,8 +2411,8 @@
 [3 of 6] Compiling Utility.Exception ( Utility/Exception.hs, Utility/Exception.o )
 [ 1 of 25] Compiling Author           ( Author.hs, Author.o )
 [4 of 6] Compiling Build.Mans       ( Build/Mans.hs, Build/Mans.o )
-[5 of 6] Compiling Main             ( Build/MakeMans.hs, Build/MakeMans.o )
 [ 3 of 25] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, Utility/FileSystemEncoding.o )
+[5 of 6] Compiling Main             ( Build/MakeMans.hs, Build/MakeMans.o )
 [6 of 6] Linking Build/MakeMans
 [ 4 of 25] Compiling Utility.Debug    ( Utility/Debug.hs, Utility/Debug.o )
 [ 5 of 25] Compiling Utility.Misc     ( Utility/Misc.hs, Utility/Misc.o )
@@ -2859,6 +2895,14 @@
 ./Setup build  -j1
 Preprocessing executable 'git-annex' for git-annex-10.20250721..
 Building executable 'git-annex' for git-annex-10.20250721..
+
+Remote/GitLFS.hs:249:2: error:
+     warning: #warning Building with old version of git-lfs, apiurl= will not be supported [-Wcpp]
+      249 | #warning Building with old version of git-lfs, apiurl= will not be supported
+          |  ^~~~~~~
+    |
+249 | #warning Building with old version of git-lfs, apiurl= will not be supported
+    |  ^
 wn
 scanning internals/git-remote-annex.mdwn
 scanning install/verifying_downloads.mdwn
@@ -3091,15 +3135,7 @@
 building git-annex-updateproxy.mdwn
 building git-annex-updatecluster.mdwn
 building git-annex-unused.mdwn
-building git-annex-untrust.
-Remote/GitLFS.hs:249:2: error:
-     warning: #warning Building with old version of git-lfs, apiurl= will not be supported [-Wcpp]
-      249 | #warning Building with old version of git-lfs, apiurl= will not be supported
-          |  ^~~~~~~
-    |
-249 | #warning Building with old version of git-lfs, apiurl= will not be supported
-    |  ^
-[  1 of 756] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.dyn_o )
+building git-annex-untrust.[  1 of 756] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.dyn_o )
 [  2 of 756] Compiling Assistant.Types.ThreadName ( Assistant/Types/ThreadName.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.dyn_o )
 [  3 of 756] Compiling Assistant.Types.TransferSlots ( Assistant/Types/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.dyn_o )
 [  4 of 756] Compiling Author           ( Author.hs, dist/build/git-annex/git-annex-tmp/Author.o, dist/build/git-annex/git-annex-tmp/Author.dyn_o )
@@ -3110,6 +3146,46 @@
 [  9 of 756] Compiling Config.Cost      ( Config/Cost.hs, dist/build/git-annex/git-annex-tmp/Config/Cost.o, dist/build/git-annex/git-annex-tmp/Config/Cost.dyn_o )
 [ 10 of 756] Compiling Database.Keys.Tables ( Database/Keys/Tables.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Tables.o, dist/build/git-annex/git-annex-tmp/Database/Keys/Tables.dyn_o )
 [ 11 of 756] Compiling Database.Utility ( Database/Utility.hs, dist/build/git-annex/git-annex-tmp/Database/Utility.o, dist/build/git-annex/git-annex-tmp/Database/Utility.dyn_o )
+[ 12 of 756] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.dyn_o )
+[ 13 of 756] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o, dist/build/git-annex/git-annex-tmp/Types/Availability.dyn_o )
+[ 14 of 756] Compiling Types.Creds      ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o, dist/build/git-annex/git-annex-tmp/Types/Creds.dyn_o )
+[ 15 of 756] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.dyn_o )
+[ 16 of 756] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.dyn_o )
+[ 17 of 756] Compiling Types.Direction  ( Types/Direction.hs, dist/build/git-annex/git-annex-tmp/Types/Direction.o, dist/build/git-annex/git-annex-tmp/Types/Direction.dyn_o )
+[ 18 of 756] Compiling Types.IndexFiles ( Types/IndexFiles.hs, dist/build/git-annex/git-annex-tmp/Types/IndexFiles.o, dist/build/git-annex/git-annex-tmp/Types/IndexFiles.dyn_o )
+[ 19 of 756] Compiling Types.Link       ( Types/Link.hs, dist/build/git-annex/git-annex-tmp/Types/Link.o, dist/build/git-annex/git-annex-tmp/Types/Link.dyn_o )
+[ 20 of 756] Compiling Types.Mime       ( Types/Mime.hs, dist/build/git-annex/git-annex-tmp/Types/Mime.o, dist/build/git-annex/git-annex-tmp/Types/Mime.dyn_o )
+[ 21 of 756] Compiling Types.ProposedAccepted ( Types/ProposedAccepted.hs, dist/build/git-annex/git-annex-tmp/Types/ProposedAccepted.o, dist/build/git-annex/git-annex-tmp/Types/ProposedAccepted.dyn_o )
+[ 22 of 756] Compiling Types.RemoteConfig ( Types/RemoteConfig.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteConfig.o, dist/build/git-annex/git-annex-tmp/Types/RemoteConfig.dyn_o )
+[ 23 of 756] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.dyn_o )
+[ 24 of 756] Compiling Types.Upgrade    ( Types/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Types/Upgrade.o, dist/build/git-annex/git-annex-tmp/Types/Upgrade.dyn_o )
+[ 25 of 756] Compiling Types.WorkerPool ( Types/WorkerPool.hs, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.o, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.dyn_o )
+[ 26 of 756] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o, dist/build/git-annex/git-annex-tmp/Utility/Applicative.dyn_o )
+[ 27 of 756] Compiling Utility.Attoparsec ( Utility/Attoparsec.hs, dist/build/git-annex/git-annex-tmp/Utility/Attoparsec.o, dist/build/git-annex/git-annex-tmp/Utility/Attoparsec.dyn_o )
+[ 28 of 756] Compiling Utility.Bloom    ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o, dist/build/git-annex/git-annex-tmp/Utility/Bloom.dyn_o )
+[ 29 of 756] Compiling Utility.Data     ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o, dist/build/git-annex/git-annex-tmp/Utility/Data.dyn_o )
+[ 30 of 756] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.dyn_o )
+[ 31 of 756] Compiling Utility.Dot      ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o, dist/build/git-annex/git-annex-tmp/Utility/Dot.dyn_o )
+[ 32 of 756] Compiling Utility.Env      ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o, dist/build/git-annex/git-annex-tmp/Utility/Env.dyn_o )
+[ 33 of 756] Compiling Utility.Env.Set  ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.dyn_o )
+[ 34 of 756] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.dyn_o )
+[ 35 of 756] Compiling Utility.Debug    ( Utility/Debug.hs, dist/build/git-annex/git-annex-tmp/Utility/Debug.o, dist/build/git-annex/git-annex-tmp/Utility/Debug.dyn_o )
+[ 36 of 756] Compiling Utility.Aeson    ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o, dist/build/git-annex/git-annex-tmp/Utility/Aeson.dyn_o )
+[ 37 of 756] Compiling Utility.Hash     ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o, dist/build/git-annex/git-annex-tmp/Utility/Hash.dyn_o )
+[ 38 of 756] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.dyn_o )
+[ 39 of 756] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.dyn_o )
+[ 40 of 756] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.dyn_o )
+[ 41 of 756] Compiling Utility.MD5      ( Utility/MD5.hs, dist/build/git-annex/git-annex-tmp/Utility/MD5.o, dist/build/git-annex/git-annex-tmp/Utility/MD5.dyn_o )
+[ 42 of 756] Compiling Utility.Misc     ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o, dist/build/git-annex/git-annex-tmp/Utility/Misc.dyn_o )
+[ 43 of 756] Compiling Utility.Monad    ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o, dist/build/git-annex/git-annex-tmp/Utility/Monad.dyn_o )
+[ 44 of 756] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o, dist/build/git-annex/git-annex-tmp/Utility/OptParse.dyn_o )
+[ 45 of 756] Compiling Utility.OsPath   ( Utility/OsPath.hs, dist/build/git-annex/git-annex-tmp/Utility/OsPath.o, dist/build/git-annex/git-annex-tmp/Utility/OsPath.dyn_o )
+[ 46 of 756] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.dyn_o )
+[ 47 of 756] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.dyn_o )
+[ 48 of 756] Compiling Utility.FileIO   ( Utility/FileIO.hs, dist/build/git-annex/git-annex-tmp/Utility/FileIO.o, dist/build/git-annex/git-annex-tmp/Utility/FileIO.dyn_o )
+[ 49 of 756] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.dyn_o )
+[ 50 of 756] Compiling Types.Transitions ( Types/Transitions.hs, dist/build/git-annex/git-annex-tmp/Types/Transitions.o, dist/build/git-annex/git-annex-tmp/Types/Transitions.dyn_o )
+[ 51 of 756] Compiling Types.Key        ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o, dist/build/git-annex/git-annex-tmp/Types/Key.dyn_o )
 mdwn
 building git-annex-unregisterurl.mdwn
 building git-annex-unlock.mdwn
@@ -3327,46 +3403,100 @@
 building tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
 building tips/migrating_data_to_a_new_backend.mdwn
 building tips/metadata_driven_views.mdwn
-[ 12 of 756] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.dyn_o )
-[ 13 of 756] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o, dist/build/git-annex/git-annex-tmp/Types/Availability.dyn_o )
-[ 14 of 756] Compiling Types.Creds      ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o, dist/build/git-annex/git-annex-tmp/Types/Creds.dyn_o )
-[ 15 of 756] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.dyn_o )
-[ 16 of 756] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.dyn_o )
-[ 17 of 756] Compiling Types.Direction  ( Types/Direction.hs, dist/build/git-annex/git-annex-tmp/Types/Direction.o, dist/build/git-annex/git-annex-tmp/Types/Direction.dyn_o )
-[ 18 of 756] Compiling Types.IndexFiles ( Types/IndexFiles.hs, dist/build/git-annex/git-annex-tmp/Types/IndexFiles.o, dist/build/git-annex/git-annex-tmp/Types/IndexFiles.dyn_o )
-[ 19 of 756] Compiling Types.Link       ( Types/Link.hs, dist/build/git-annex/git-annex-tmp/Types/Link.o, dist/build/git-annex/git-annex-tmp/Types/Link.dyn_o )
-[ 20 of 756] Compiling Types.Mime       ( Types/Mime.hs, dist/build/git-annex/git-annex-tmp/Types/Mime.o, dist/build/git-annex/git-annex-tmp/Types/Mime.dyn_o )
-[ 21 of 756] Compiling Types.ProposedAccepted ( Types/ProposedAccepted.hs, dist/build/git-annex/git-annex-tmp/Types/ProposedAccepted.o, dist/build/git-annex/git-annex-tmp/Types/ProposedAccepted.dyn_o )
-[ 22 of 756] Compiling Types.RemoteConfig ( Types/RemoteConfig.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteConfig.o, dist/build/git-annex/git-annex-tmp/Types/RemoteConfig.dyn_o )
-[ 23 of 756] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.dyn_o )
-[ 24 of 756] Compiling Types.Upgrade    ( Types/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Types/Upgrade.o, dist/build/git-annex/git-annex-tmp/Types/Upgrade.dyn_o )
-[ 25 of 756] Compiling Types.WorkerPool ( Types/WorkerPool.hs, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.o, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.dyn_o )
-[ 26 of 756] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o, dist/build/git-annex/git-annex-tmp/Utility/Applicative.dyn_o )
-[ 27 of 756] Compiling Utility.Attoparsec ( Utility/Attoparsec.hs, dist/build/git-annex/git-annex-tmp/Utility/Attoparsec.o, dist/build/git-annex/git-annex-tmp/Utility/Attoparsec.dyn_o )
-[ 28 of 756] Compiling Utility.Bloom    ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o, dist/build/git-annex/git-annex-tmp/Utility/Bloom.dyn_o )
-[ 29 of 756] Compiling Utility.Data     ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o, dist/build/git-annex/git-annex-tmp/Utility/Data.dyn_o )
-[ 30 of 756] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.dyn_o )
-[ 31 of 756] Compiling Utility.Dot      ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o, dist/build/git-annex/git-annex-tmp/Utility/Dot.dyn_o )
-[ 32 of 756] Compiling Utility.Env      ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o, dist/build/git-annex/git-annex-tmp/Utility/Env.dyn_o )
-[ 33 of 756] Compiling Utility.Env.Set  ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.dyn_o )
-[ 34 of 756] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.dyn_o )
-[ 35 of 756] Compiling Utility.Debug    ( Utility/Debug.hs, dist/build/git-annex/git-annex-tmp/Utility/Debug.o, dist/build/git-annex/git-annex-tmp/Utility/Debug.dyn_o )
-[ 36 of 756] Compiling Utility.Aeson    ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o, dist/build/git-annex/git-annex-tmp/Utility/Aeson.dyn_o )
-[ 37 of 756] Compiling Utility.Hash     ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o, dist/build/git-annex/git-annex-tmp/Utility/Hash.dyn_o )
-[ 38 of 756] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.dyn_o )
-[ 39 of 756] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.dyn_o )
-[ 40 of 756] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.dyn_o )
-[ 41 of 756] Compiling Utility.MD5      ( Utility/MD5.hs, dist/build/git-annex/git-annex-tmp/Utility/MD5.o, dist/build/git-annex/git-annex-tmp/Utility/MD5.dyn_o )
-[ 42 of 756] Compiling Utility.Misc     ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o, dist/build/git-annex/git-annex-tmp/Utility/Misc.dyn_o )
-[ 43 of 756] Compiling Utility.Monad    ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o, dist/build/git-annex/git-annex-tmp/Utility/Monad.dyn_o )
-[ 44 of 756] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o, dist/build/git-annex/git-annex-tmp/Utility/OptParse.dyn_o )
-[ 45 of 756] Compiling Utility.OsPath   ( Utility/OsPath.hs, dist/build/git-annex/git-annex-tmp/Utility/OsPath.o, dist/build/git-annex/git-annex-tmp/Utility/OsPath.dyn_o )
-[ 46 of 756] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.dyn_o )
-[ 47 of 756] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.dyn_o )
-[ 48 of 756] Compiling Utility.FileIO   ( Utility/FileIO.hs, dist/build/git-annex/git-annex-tmp/Utility/FileIO.o, dist/build/git-annex/git-annex-tmp/Utility/FileIO.dyn_o )
-[ 49 of 756] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.dyn_o )
-[ 50 of 756] Compiling Types.Transitions ( Types/Transitions.hs, dist/build/git-annex/git-annex-tmp/Types/Transitions.o, dist/build/git-annex/git-annex-tmp/Types/Transitions.dyn_o )
-[ 51 of 756] Compiling Types.Key        ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o, dist/build/git-annex/git-annex-tmp/Types/Key.dyn_o )
+[ 52 of 756] Compiling Types.GitRemoteAnnex ( Types/GitRemoteAnnex.hs, dist/build/git-annex/git-annex-tmp/Types/GitRemoteAnnex.o, dist/build/git-annex/git-annex-tmp/Types/GitRemoteAnnex.dyn_o )
+[ 53 of 756] Compiling Utility.OsString ( Utility/OsString.hs, dist/build/git-annex/git-annex-tmp/Utility/OsString.o, dist/build/git-annex/git-annex-tmp/Utility/OsString.dyn_o )
+[ 54 of 756] Compiling Utility.PID      ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o, dist/build/git-annex/git-annex-tmp/Utility/PID.dyn_o )
+[ 55 of 756] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.dyn_o )
+[ 56 of 756] Compiling Utility.Format   ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o, dist/build/git-annex/git-annex-tmp/Utility/Format.dyn_o )
+[ 57 of 756] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o, dist/build/git-annex/git-annex-tmp/Types/Concurrency.dyn_o )
+[ 58 of 756] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o, dist/build/git-annex/git-annex-tmp/Utility/Percentage.dyn_o )
+[ 59 of 756] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.dyn_o )
+[ 60 of 756] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.dyn_o )
+[ 61 of 756] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.dyn_o )
+[ 62 of 756] Compiling Types.VectorClock ( Types/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Types/VectorClock.o, dist/build/git-annex/git-annex-tmp/Types/VectorClock.dyn_o )
+[ 63 of 756] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.dyn_o )
+[ 64 of 756] Compiling Utility.OpenFd   ( Utility/OpenFd.hs, dist/build/git-annex/git-annex-tmp/Utility/OpenFd.o, dist/build/git-annex/git-annex-tmp/Utility/OpenFd.dyn_o )
+[ 65 of 756] Compiling Utility.OpenFile ( Utility/OpenFile.hs, dist/build/git-annex/git-annex-tmp/Utility/OpenFile.o, dist/build/git-annex/git-annex-tmp/Utility/OpenFile.dyn_o )
+[ 66 of 756] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o, dist/build/git-annex/git-annex-tmp/Utility/FileSize.dyn_o )
+[ 67 of 756] Compiling Database.RawFilePath ( Database/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Database/RawFilePath.o, dist/build/git-annex/git-annex-tmp/Database/RawFilePath.dyn_o )
+[ 68 of 756] Compiling Utility.STM      ( Utility/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/STM.o, dist/build/git-annex/git-annex-tmp/Utility/STM.dyn_o )
+[ 69 of 756] Compiling Utility.SafeOutput ( Utility/SafeOutput.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeOutput.o, dist/build/git-annex/git-annex-tmp/Utility/SafeOutput.dyn_o )
+[ 70 of 756] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o, dist/build/git-annex/git-annex-tmp/Utility/Exception.dyn_o )
+[ 71 of 756] Compiling Utility.Process  ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o, dist/build/git-annex/git-annex-tmp/Utility/Process.dyn_o )
+[ 72 of 756] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.dyn_o )
+[ 73 of 756] Compiling Git.Types        ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o, dist/build/git-annex/git-annex-tmp/Git/Types.dyn_o )
+[ 74 of 756] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.dyn_o )
+[ 75 of 756] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.dyn_o )
+[ 76 of 756] Compiling Utility.Network  ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o, dist/build/git-annex/git-annex-tmp/Utility/Network.dyn_o )
+[ 77 of 756] Compiling Utility.Mounts   ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o, dist/build/git-annex/git-annex-tmp/Utility/Mounts.dyn_o )
+[ 78 of 756] Compiling Utility.MonotonicClock ( Utility/MonotonicClock.hs, dist/build/git-annex/git-annex-tmp/Utility/MonotonicClock.o, dist/build/git-annex/git-annex-tmp/Utility/MonotonicClock.dyn_o )
+[ 79 of 756] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.dyn_o )
+[ 80 of 756] Compiling Utility.Glob     ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o, dist/build/git-annex/git-annex-tmp/Utility/Glob.dyn_o )
+[ 81 of 756] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o, dist/build/git-annex/git-annex-tmp/Utility/FileMode.dyn_o )
+[ 82 of 756] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.dyn_o )
+[ 83 of 756] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.dyn_o )
+[ 84 of 756] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool.dyn_o )
+[ 85 of 756] Compiling Types.LockCache  ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o, dist/build/git-annex/git-annex-tmp/Types/LockCache.dyn_o )
+[ 86 of 756] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile.dyn_o )
+[ 87 of 756] Compiling Git.FileMode     ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o, dist/build/git-annex/git-annex-tmp/Git/FileMode.dyn_o )
+[ 88 of 756] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.dyn_o )
+[ 89 of 756] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.dyn_o )
+[ 90 of 756] Compiling Utility.DBus     ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o, dist/build/git-annex/git-annex-tmp/Utility/DBus.dyn_o )
+[ 91 of 756] Compiling Utility.Base64   ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o, dist/build/git-annex/git-annex-tmp/Utility/Base64.dyn_o )
+[ 92 of 756] Compiling Git.PktLine      ( Git/PktLine.hs, dist/build/git-annex/git-annex-tmp/Git/PktLine.o, dist/build/git-annex/git-annex-tmp/Git/PktLine.dyn_o )
+[ 93 of 756] Compiling Build.Version    ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o, dist/build/git-annex/git-annex-tmp/Build/Version.dyn_o )
+[ 94 of 756] Compiling Build.Mans       ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o, dist/build/git-annex/git-annex-tmp/Build/Mans.dyn_o )
+[ 95 of 756] Compiling Annex.UntrustedFilePath ( Annex/UntrustedFilePath.hs, dist/build/git-annex/git-annex-tmp/Annex/UntrustedFilePath.o, dist/build/git-annex/git-annex-tmp/Annex/UntrustedFilePath.dyn_o )
+[ 96 of 756] Compiling Utility.Shell    ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o, dist/build/git-annex/git-annex-tmp/Utility/Shell.dyn_o )
+[ 97 of 756] Compiling Utility.Split    ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o, dist/build/git-annex/git-annex-tmp/Utility/Split.dyn_o )
+[ 98 of 756] Compiling Utility.ShellEscape ( Utility/ShellEscape.hs, dist/build/git-annex/git-annex-tmp/Utility/ShellEscape.o, dist/build/git-annex/git-annex-tmp/Utility/ShellEscape.dyn_o )
+[ 99 of 756] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.dyn_o )
+[100 of 756] Compiling Git.Version      ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o, dist/build/git-annex/git-annex-tmp/Git/Version.dyn_o )
+[101 of 756] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.dyn_o )
+[102 of 756] Compiling Utility.SshHost  ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o, dist/build/git-annex/git-annex-tmp/Utility/SshHost.dyn_o )
+[103 of 756] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.dyn_o )
+[104 of 756] Compiling Utility.Path     ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o, dist/build/git-annex/git-annex-tmp/Utility/Path.dyn_o )
+[105 of 756] Compiling Utility.Path.Windows ( Utility/Path/Windows.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Windows.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Windows.dyn_o )
+[106 of 756] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.dyn_o )
+[107 of 756] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o, dist/build/git-annex/git-annex-tmp/Utility/Directory.dyn_o )
+[108 of 756] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.dyn_o )
+[109 of 756] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o, dist/build/git-annex/git-annex-tmp/Build/TestConfig.dyn_o )
+[110 of 756] Compiling Build.Configure  ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o, dist/build/git-annex/git-annex-tmp/Build/Configure.dyn_o )
+[111 of 756] Compiling Utility.Tense    ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o, dist/build/git-annex/git-annex-tmp/Utility/Tense.dyn_o )
+[112 of 756] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.dyn_o )
+[113 of 756] Compiling Utility.Terminal ( Utility/Terminal.hs, dist/build/git-annex/git-annex-tmp/Utility/Terminal.o, dist/build/git-annex/git-annex-tmp/Utility/Terminal.dyn_o )
+[114 of 756] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.dyn_o )
+[115 of 756] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.dyn_o )
+[116 of 756] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.dyn_o )
+[117 of 756] Compiling Annex.VectorClock.Utility ( Annex/VectorClock/Utility.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock/Utility.o, dist/build/git-annex/git-annex-tmp/Annex/VectorClock/Utility.dyn_o )
+[118 of 756] Compiling Utility.Tmp      ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o, dist/build/git-annex/git-annex-tmp/Utility/Tmp.dyn_o )
+[119 of 756] Compiling Utility.MoveFile ( Utility/MoveFile.hs, dist/build/git-annex/git-annex-tmp/Utility/MoveFile.o, dist/build/git-annex/git-annex-tmp/Utility/MoveFile.dyn_o )
+[120 of 756] Compiling Utility.Tmp.Dir  ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.dyn_o )
+[121 of 756] Compiling Utility.Touch    ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o, dist/build/git-annex/git-annex-tmp/Utility/Touch.dyn_o )
+[122 of 756] Compiling Utility.Tuple    ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o, dist/build/git-annex/git-annex-tmp/Utility/Tuple.dyn_o )
+[123 of 756] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.dyn_o )
+[124 of 756] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.dyn_o )
+[125 of 756] Compiling Utility.Url.Parse ( Utility/Url/Parse.hs, dist/build/git-annex/git-annex-tmp/Utility/Url/Parse.o, dist/build/git-annex/git-annex-tmp/Utility/Url/Parse.dyn_o )
+[126 of 756] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.dyn_o )
+[127 of 756] Compiling Utility.Path.AbsRel ( Utility/Path/AbsRel.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/AbsRel.o, dist/build/git-annex/git-annex-tmp/Utility/Path/AbsRel.dyn_o )
+[128 of 756] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.dyn_o )
+[129 of 756] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.dyn_o )
+[130 of 756] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.dyn_o )
+[131 of 756] Compiling Utility.Directory.Create ( Utility/Directory/Create.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Create.o, dist/build/git-annex/git-annex-tmp/Utility/Directory/Create.dyn_o )
+[132 of 756] Compiling Common           ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o, dist/build/git-annex/git-annex-tmp/Common.dyn_o )
+[133 of 756] Compiling Utility.Tor      ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o, dist/build/git-annex/git-annex-tmp/Utility/Tor.dyn_o )
+[134 of 756] Compiling Utility.TList    ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o, dist/build/git-annex/git-annex-tmp/Utility/TList.dyn_o )
+[135 of 756] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.dyn_o )
+[136 of 756] Compiling Utility.Su       ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o, dist/build/git-annex/git-annex-tmp/Utility/Su.dyn_o )
+[137 of 756] Compiling Utility.StatelessOpenPGP ( Utility/StatelessOpenPGP.hs, dist/build/git-annex/git-annex-tmp/Utility/StatelessOpenPGP.o, dist/build/git-annex/git-annex-tmp/Utility/StatelessOpenPGP.dyn_o )
+[138 of 756] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.dyn_o )
+[139 of 756] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.dyn_o )
+[140 of 756] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.dyn_o )
+[141 of 756] Compiling Utility.ResourcePool ( Utility/ResourcePool.hs, dist/build/git-annex/git-annex-tmp/Utility/ResourcePool.o, dist/build/git-annex/git-annex-tmp/Utility/ResourcePool.dyn_o )
+[142 of 756] Compiling Utility.Path.Tests ( Utility/Path/Tests.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Tests.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Tests.dyn_o )
+[143 of 756] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.dyn_o )
+[144 of 756] Compiling Utility.Metered  ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o, dist/build/git-annex/git-annex-tmp/Utility/Metered.dyn_o )
+[145 of 756] Compiling Utility.Url      ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o, dist/build/git-annex/git-annex-tmp/Utility/Url.dyn_o )
 building tips/megaannex.mdwn
 building tips/mc_menu_integration.mdwn
 building tips/making_a_remote_repo_update_when_changes_are_pushed_to_it.mdwn
@@ -3558,100 +3688,41 @@
 building design/encryption.mdwn
 building design/compute_special_remote_interface.mdwn
 building design/caching_database.mdwn
-building design[ 52 of 756] Compiling Types.GitRemoteAnnex ( Types/GitRemoteAnnex.hs, dist/build/git-annex/git-annex-tmp/Types/GitRemoteAnnex.o, dist/build/git-annex/git-annex-tmp/Types/GitRemoteAnnex.dyn_o )
-[ 53 of 756] Compiling Utility.OsString ( Utility/OsString.hs, dist/build/git-annex/git-annex-tmp/Utility/OsString.o, dist/build/git-annex/git-annex-tmp/Utility/OsString.dyn_o )
-[ 54 of 756] Compiling Utility.PID      ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o, dist/build/git-annex/git-annex-tmp/Utility/PID.dyn_o )
-[ 55 of 756] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.dyn_o )
-[ 56 of 756] Compiling Utility.Format   ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o, dist/build/git-annex/git-annex-tmp/Utility/Format.dyn_o )
-[ 57 of 756] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o, dist/build/git-annex/git-annex-tmp/Types/Concurrency.dyn_o )
-[ 58 of 756] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o, dist/build/git-annex/git-annex-tmp/Utility/Percentage.dyn_o )
-[ 59 of 756] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.dyn_o )
-[ 60 of 756] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.dyn_o )
-[ 61 of 756] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.dyn_o )
-[ 62 of 756] Compiling Types.VectorClock ( Types/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Types/VectorClock.o, dist/build/git-annex/git-annex-tmp/Types/VectorClock.dyn_o )
-[ 63 of 756] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.dyn_o )
-[ 64 of 756] Compiling Utility.OpenFd   ( Utility/OpenFd.hs, dist/build/git-annex/git-annex-tmp/Utility/OpenFd.o, dist/build/git-annex/git-annex-tmp/Utility/OpenFd.dyn_o )
-[ 65 of 756] Compiling Utility.OpenFile ( Utility/OpenFile.hs, dist/build/git-annex/git-annex-tmp/Utility/OpenFile.o, dist/build/git-annex/git-annex-tmp/Utility/OpenFile.dyn_o )
-[ 66 of 756] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o, dist/build/git-annex/git-annex-tmp/Utility/FileSize.dyn_o )
-[ 67 of 756] Compiling Database.RawFilePath ( Database/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Database/RawFilePath.o, dist/build/git-annex/git-annex-tmp/Database/RawFilePath.dyn_o )
-[ 68 of 756] Compiling Utility.STM      ( Utility/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/STM.o, dist/build/git-annex/git-annex-tmp/Utility/STM.dyn_o )
-[ 69 of 756] Compiling Utility.SafeOutput ( Utility/SafeOutput.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeOutput.o, dist/build/git-annex/git-annex-tmp/Utility/SafeOutput.dyn_o )
-[ 70 of 756] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o, dist/build/git-annex/git-annex-tmp/Utility/Exception.dyn_o )
-[ 71 of 756] Compiling Utility.Process  ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o, dist/build/git-annex/git-annex-tmp/Utility/Process.dyn_o )
-[ 72 of 756] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.dyn_o )
-[ 73 of 756] Compiling Git.Types        ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o, dist/build/git-annex/git-annex-tmp/Git/Types.dyn_o )
-[ 74 of 756] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.dyn_o )
-[ 75 of 756] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.dyn_o )
-[ 76 of 756] Compiling Utility.Network  ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o, dist/build/git-annex/git-annex-tmp/Utility/Network.dyn_o )
-[ 77 of 756] Compiling Utility.Mounts   ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o, dist/build/git-annex/git-annex-tmp/Utility/Mounts.dyn_o )
-[ 78 of 756] Compiling Utility.MonotonicClock ( Utility/MonotonicClock.hs, dist/build/git-annex/git-annex-tmp/Utility/MonotonicClock.o, dist/build/git-annex/git-annex-tmp/Utility/MonotonicClock.dyn_o )
-[ 79 of 756] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.dyn_o )
-[ 80 of 756] Compiling Utility.Glob     ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o, dist/build/git-annex/git-annex-tmp/Utility/Glob.dyn_o )
-[ 81 of 756] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o, dist/build/git-annex/git-annex-tmp/Utility/FileMode.dyn_o )
-[ 82 of 756] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.dyn_o )
-[ 83 of 756] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.dyn_o )
-[ 84 of 756] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool.dyn_o )
-[ 85 of 756] Compiling Types.LockCache  ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o, dist/build/git-annex/git-annex-tmp/Types/LockCache.dyn_o )
-[ 86 of 756] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile.dyn_o )
-[ 87 of 756] Compiling Git.FileMode     ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o, dist/build/git-annex/git-annex-tmp/Git/FileMode.dyn_o )
-[ 88 of 756] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.dyn_o )
-[ 89 of 756] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.dyn_o )
-[ 90 of 756] Compiling Utility.DBus     ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o, dist/build/git-annex/git-annex-tmp/Utility/DBus.dyn_o )
-[ 91 of 756] Compiling Utility.Base64   ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o, dist/build/git-annex/git-annex-tmp/Utility/Base64.dyn_o )
-[ 92 of 756] Compiling Git.PktLine      ( Git/PktLine.hs, dist/build/git-annex/git-annex-tmp/Git/PktLine.o, dist/build/git-annex/git-annex-tmp/Git/PktLine.dyn_o )
-[ 93 of 756] Compiling Build.Version    ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o, dist/build/git-annex/git-annex-tmp/Build/Version.dyn_o )
-[ 94 of 756] Compiling Build.Mans       ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o, dist/build/git-annex/git-annex-tmp/Build/Mans.dyn_o )
-[ 95 of 756] Compiling Annex.UntrustedFilePath ( Annex/UntrustedFilePath.hs, dist/build/git-annex/git-annex-tmp/Annex/UntrustedFilePath.o, dist/build/git-annex/git-annex-tmp/Annex/UntrustedFilePath.dyn_o )
-[ 96 of 756] Compiling Utility.Shell    ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o, dist/build/git-annex/git-annex-tmp/Utility/Shell.dyn_o )
-[ 97 of 756] Compiling Utility.Split    ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o, dist/build/git-annex/git-annex-tmp/Utility/Split.dyn_o )
-[ 98 of 756] Compiling Utility.ShellEscape ( Utility/ShellEscape.hs, dist/build/git-annex/git-annex-tmp/Utility/ShellEscape.o, dist/build/git-annex/git-annex-tmp/Utility/ShellEscape.dyn_o )
-[ 99 of 756] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.dyn_o )
-[100 of 756] Compiling Git.Version      ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o, dist/build/git-annex/git-annex-tmp/Git/Version.dyn_o )
-[101 of 756] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.dyn_o )
-[102 of 756] Compiling Utility.SshHost  ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o, dist/build/git-annex/git-annex-tmp/Utility/SshHost.dyn_o )
-[103 of 756] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.dyn_o )
-[104 of 756] Compiling Utility.Path     ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o, dist/build/git-annex/git-annex-tmp/Utility/Path.dyn_o )
-[105 of 756] Compiling Utility.Path.Windows ( Utility/Path/Windows.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Windows.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Windows.dyn_o )
-[106 of 756] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.dyn_o )
-[107 of 756] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o, dist/build/git-annex/git-annex-tmp/Utility/Directory.dyn_o )
-[108 of 756] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.dyn_o )
-[109 of 756] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o, dist/build/git-annex/git-annex-tmp/Build/TestConfig.dyn_o )
-[110 of 756] Compiling Build.Configure  ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o, dist/build/git-annex/git-annex-tmp/Build/Configure.dyn_o )
-[111 of 756] Compiling Utility.Tense    ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o, dist/build/git-annex/git-annex-tmp/Utility/Tense.dyn_o )
-[112 of 756] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.dyn_o )
-[113 of 756] Compiling Utility.Terminal ( Utility/Terminal.hs, dist/build/git-annex/git-annex-tmp/Utility/Terminal.o, dist/build/git-annex/git-annex-tmp/Utility/Terminal.dyn_o )
-[114 of 756] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.dyn_o )
-[115 of 756] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.dyn_o )
-[116 of 756] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.dyn_o )
-[117 of 756] Compiling Annex.VectorClock.Utility ( Annex/VectorClock/Utility.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock/Utility.o, dist/build/git-annex/git-annex-tmp/Annex/VectorClock/Utility.dyn_o )
-[118 of 756] Compiling Utility.Tmp      ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o, dist/build/git-annex/git-annex-tmp/Utility/Tmp.dyn_o )
-[119 of 756] Compiling Utility.MoveFile ( Utility/MoveFile.hs, dist/build/git-annex/git-annex-tmp/Utility/MoveFile.o, dist/build/git-annex/git-annex-tmp/Utility/MoveFile.dyn_o )
-[120 of 756] Compiling Utility.Tmp.Dir  ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.dyn_o )
-[121 of 756] Compiling Utility.Touch    ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o, dist/build/git-annex/git-annex-tmp/Utility/Touch.dyn_o )
-[122 of 756] Compiling Utility.Tuple    ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o, dist/build/git-annex/git-annex-tmp/Utility/Tuple.dyn_o )
-[123 of 756] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.dyn_o )
-[124 of 756] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.dyn_o )
-[125 of 756] Compiling Utility.Url.Parse ( Utility/Url/Parse.hs, dist/build/git-annex/git-annex-tmp/Utility/Url/Parse.o, dist/build/git-annex/git-annex-tmp/Utility/Url/Parse.dyn_o )
-[126 of 756] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.dyn_o )
-[127 of 756] Compiling Utility.Path.AbsRel ( Utility/Path/AbsRel.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/AbsRel.o, dist/build/git-annex/git-annex-tmp/Utility/Path/AbsRel.dyn_o )
-[128 of 756] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.dyn_o )
-[129 of 756] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.dyn_o )
-[130 of 756] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.dyn_o )
-[131 of 756] Compiling Utility.Directory.Create ( Utility/Directory/Create.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Create.o, dist/build/git-annex/git-annex-tmp/Utility/Directory/Create.dyn_o )
-[132 of 756] Compiling Common           ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o, dist/build/git-annex/git-annex-tmp/Common.dyn_o )
-[133 of 756] Compiling Utility.Tor      ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o, dist/build/git-annex/git-annex-tmp/Utility/Tor.dyn_o )
-[134 of 756] Compiling Utility.TList    ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o, dist/build/git-annex/git-annex-tmp/Utility/TList.dyn_o )
-[135 of 756] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.dyn_o )
-[136 of 756] Compiling Utility.Su       ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o, dist/build/git-annex/git-annex-tmp/Utility/Su.dyn_o )
-[137 of 756] Compiling Utility.StatelessOpenPGP ( Utility/StatelessOpenPGP.hs, dist/build/git-annex/git-annex-tmp/Utility/StatelessOpenPGP.o, dist/build/git-annex/git-annex-tmp/Utility/StatelessOpenPGP.dyn_o )
-[138 of 756] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.dyn_o )
-[139 of 756] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.dyn_o )
-[140 of 756] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.dyn_o )
-[141 of 756] Compiling Utility.ResourcePool ( Utility/ResourcePool.hs, dist/build/git-annex/git-annex-tmp/Utility/ResourcePool.o, dist/build/git-annex/git-annex-tmp/Utility/ResourcePool.dyn_o )
-[142 of 756] Compiling Utility.Path.Tests ( Utility/Path/Tests.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Tests.o, dist/build/git-annex/git-annex-tmp/Utility/Path/Tests.dyn_o )
-[143 of 756] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.dyn_o )
-[144 of 756] Compiling Utility.Metered  ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o, dist/build/git-annex/git-annex-tmp/Utility/Metered.dyn_o )
-[145 of 756] Compiling Utility.Url      ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o, dist/build/git-annex/git-annex-tmp/Utility/Url.dyn_o )
+building design[146 of 756] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o, dist/build/git-annex/git-annex-tmp/Types/UrlContents.dyn_o )
+[147 of 756] Compiling Utility.Rsync    ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o, dist/build/git-annex/git-annex-tmp/Utility/Rsync.dyn_o )
+[148 of 756] Compiling Types.Messages   ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o, dist/build/git-annex/git-annex-tmp/Types/Messages.dyn_o )
+[149 of 756] Compiling Utility.Matcher  ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o, dist/build/git-annex/git-annex-tmp/Utility/Matcher.dyn_o )
+[150 of 756] Compiling Utility.Lsof     ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o, dist/build/git-annex/git-annex-tmp/Utility/Lsof.dyn_o )
+[151 of 756] Compiling Utility.LogFile  ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o, dist/build/git-annex/git-annex-tmp/Utility/LogFile.dyn_o )
+[152 of 756] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.dyn_o )
+[153 of 756] Compiling Types.KeySource  ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o, dist/build/git-annex/git-annex-tmp/Types/KeySource.dyn_o )
+[154 of 756] Compiling Types.Backend    ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o, dist/build/git-annex/git-annex-tmp/Types/Backend.dyn_o )
+[155 of 756] Compiling Database.Handle  ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o, dist/build/git-annex/git-annex-tmp/Database/Handle.dyn_o )
+[156 of 756] Compiling Database.RepoSize.Handle ( Database/RepoSize/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/RepoSize/Handle.o, dist/build/git-annex/git-annex-tmp/Database/RepoSize/Handle.dyn_o )
+[157 of 756] Compiling Database.Queue   ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o, dist/build/git-annex/git-annex-tmp/Database/Queue.dyn_o )
+[158 of 756] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.dyn_o )
+[159 of 756] Compiling Utility.Gpg      ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o, dist/build/git-annex/git-annex-tmp/Utility/Gpg.dyn_o )
+[160 of 756] Compiling Types.Crypto     ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o, dist/build/git-annex/git-annex-tmp/Types/Crypto.dyn_o )
+[161 of 756] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.dyn_o )
+[162 of 756] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.dyn_o )
+[163 of 756] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.dyn_o )
+[164 of 756] Compiling Utility.Daemon   ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o, dist/build/git-annex/git-annex-tmp/Utility/Daemon.dyn_o )
+[165 of 756] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.dyn_o )
+[166 of 756] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.dyn_o )
+[167 of 756] Compiling Utility.Batch    ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o, dist/build/git-annex/git-annex-tmp/Utility/Batch.dyn_o )
+[168 of 756] Compiling Utility.Android  ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o, dist/build/git-annex/git-annex-tmp/Utility/Android.dyn_o )
+[169 of 756] Compiling Types.UUID       ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o, dist/build/git-annex/git-annex-tmp/Types/UUID.dyn_o )
+[170 of 756] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.dyn_o )
+[171 of 756] Compiling Types.RepoSize   ( Types/RepoSize.hs, dist/build/git-annex/git-annex-tmp/Types/RepoSize.o, dist/build/git-annex/git-annex-tmp/Types/RepoSize.dyn_o )
+[172 of 756] Compiling Types.RemoteState ( Types/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteState.o, dist/build/git-annex/git-annex-tmp/Types/RemoteState.dyn_o )
+[173 of 756] Compiling Types.NumCopies  ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o, dist/build/git-annex/git-annex-tmp/Types/NumCopies.dyn_o )
+[174 of 756] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.dyn_o )
+[175 of 756] Compiling Types.Cluster    ( Types/Cluster.hs, dist/build/git-annex/git-annex-tmp/Types/Cluster.o, dist/build/git-annex/git-annex-tmp/Types/Cluster.dyn_o )
+[176 of 756] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.dyn_o )
+[177 of 756] Compiling Types.TransferrerPool ( Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Types/TransferrerPool.o, dist/build/git-annex/git-annex-tmp/Types/TransferrerPool.dyn_o )
+[178 of 756] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.dyn_o )
+[179 of 756] Compiling Types.RefSpec    ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o, dist/build/git-annex/git-annex-tmp/Types/RefSpec.dyn_o )
+[180 of 756] Compiling Types.MetaData   ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o, dist/build/git-annex/git-annex-tmp/Types/MetaData.dyn_o )
 /balanced_preferred_content.mdwn
 building design/assistant.mdwn
 building design/adjusted_branches.mdwn
@@ -3762,31 +3833,31 @@
 building wikiicons/email.png
 building wikiicons/diff.png
 building templates/popup.mdwn
-building backends/comment_2_1f2626eca9004b31a0b7fc1a0df8027b._comment, which links to special_remotes
-building backends/comment_31_32df8ec41dd8a6516b88b1871c998eb9._comment, which links to special_remotes
 building special_remotes/rsync/comment_2_25545dc0b53f09ae73b29899c8884b02._comment, which links to special_remotes
-building walkthrough/modifying_annexed_files/comment_1_624b4a0b521b553d68ab6049f7dbaf8c._comment, which links to special_remotes
+building backends/comment_31_32df8ec41dd8a6516b88b1871c998eb9._comment, which links to special_remotes
 building special_remotes/rsync/comment_9_5dcf10a502b2d4feac46b620d43e9d00._comment, which links to special_remotes
+building backends/comment_2_1f2626eca9004b31a0b7fc1a0df8027b._comment, which links to special_remotes
+building walkthrough/modifying_annexed_files/comment_1_624b4a0b521b553d68ab6049f7dbaf8c._comment, which links to special_remotes
 building tips/Repositories_with_large_number_of_files/comment_6_9169a33c06cf8aea231cdd8f51ce17b6._comment, which links to scalability
-building design/assistant/partial_content/comment_2_588009d2140b7d259cdf191dca539e14._comment, which links to preferred_content
 building git-annex-preferred-content/comment_2_e4e0f34466db1fecd21db0e929530ad0._comment, which links to preferred_content
 building tips/setup_a_public_repository_on_a_web_site/comment_2_b98b761dee9d923153e3c288c1d987ee._comment, which links to preferred_content
-building git-annex-unused/comment_8_10ee2770ffe1cde367f3d310b2670539._comment, which links to location_tracking
+building design/assistant/partial_content/comment_2_588009d2140b7d259cdf191dca539e14._comment, which links to preferred_content
 building internals/comment_14_3f62751c2dd041f4ead1c6580ea5eec1._comment, which links to location_tracking
-building encryption/comment_17_a2195a298f65e427fe8460c8bc380f99._comment, which links to internals
+building git-annex-unused/comment_8_10ee2770ffe1cde367f3d310b2670539._comment, which links to location_tracking
+building workflow/comment_2_67edac29c0e7b5a768511a0fd0878947._comment, which links to internals
 building git-annex-setpresentkey/comment_3_30a5d3fbd8e02726989ab80ed98b4a54._comment, which links to internals
+building encryption/comment_14_fb6ec1f42789a62358605e293b678318._comment, which links to internals
 building special_remotes/tahoe/comment_9_75eccd07ea57f44d5a198533a907225a._comment, which links to internals
 building bare_repositories/comment_6_bf227861ec3cb2ea474c143218c68133._comment, which links to internals
-building workflow/comment_2_67edac29c0e7b5a768511a0fd0878947._comment, which links to internals
-building how_it_works/comment_6_2ad3441a02f1bcc2cca0c10ecf7b216f._comment, which links to internals
-building encryption/comment_14_fb6ec1f42789a62358605e293b678318._comment, which links to internals
 building backends/comment_10_920cd139dfec8adb1089f5acf26de4d2._comment, which links to internals
-building git-annex-config/comment_3_cd443c49f9d1122f078872259e342683._comment, which links to git-annex
+building encryption/comment_17_a2195a298f65e427fe8460c8bc380f99._comment, which links to internals
+building how_it_works/comment_6_2ad3441a02f1bcc2cca0c10ecf7b216f._comment, which links to internals
 building git-annex-add/comment_3_8517f9634d217f731efd704405d3f2ca._comment, which links to git-annex
+building git-annex-config/comment_3_cd443c49f9d1122f078872259e342683._comment, which links to git-annex
 building git-annex-unused/comment_9_cfcc0bab810d58b7db66c2fa4e92f769._comment, which links to git-annex-whereis
 building tips/hiding_missing_files/comment_1_eba2b140f9d5a9f7ee23cb3ba7da7612._comment, which links to git-annex-upgrade
-building git-annex-addurl/comment_12_f75e35ae6f739e98aeb15c3f8708be8a._comment, which links to git-annex-unused
 building walkthrough/unused_data/comment_5_46acb9fbbd5ef19f65115723888f3eb6._comment, which links to git-annex-unused
+building git-annex-addurl/comment_12_f75e35ae6f739e98aeb15c3f8708be8a._comment, which links to git-annex-unused
 building internals/comment_13_e45b6fa035a30703618448a0f764f935._comment, which links to git-annex-unused
 building git-annex-unannex/comment_7_a6b64c4d90f4d228b8facce5e2399eca._comment, which links to git-annex-unlock
 building git-annex-undo/comment_4_18ed23e07ffed1cbf63e71fb115b0654._comment, which links to git-annex-unannex
@@ -3802,8 +3873,8 @@
 building git-annex-unused/comment_3_5eb913bb96a04a174c04fe5d119977f4._comment, which links to git-annex-dropunused
 building special_remotes/comment_47_780e9ba56a2a83d64583521b8d987e33._comment, which links to git-annex-dead
 building special_remotes/S3/comment_8_0fa68d584ee7f6b5c9058fba7e911a11._comment, which links to future_proofing
-building git-annex-drop/comment_5_655f0bcaafdf03eb637af715e7642e27._comment, which links to copies
 building not/comment_13_c5c20576388f18daba3af913b44fb001._comment, which links to copies
+building git-annex-drop/comment_5_655f0bcaafdf03eb637af715e7642e27._comment, which links to copies
 building walkthrough/removing_files/comment_4_9b575f7f2b67b36599890dd5455dcf47._comment, which links to copies
 building sync/comment_4_cf29326408e62575085d1f980087c923._comment, which links to assistant
 building walkthrough/adding_a_remote/comment_2_f8cd79ef1593a8181a7f1086a87713e8._comment, which links to walkthrough/getting_file_content
@@ -3823,52 +3894,17 @@
 building tuning/comment_2_a0091dbb39b79dfe101d05f9a5db216f._comment, which links to internals/hashing
 building install/fromsource/comment_66_849c4c2cfc34991c13d55495e391cce3._comment, which links to install/fromsource
 building install/fromsource/comment_3_55bed050bdb768543dbe1b86edec057d._comment, which links to install/Ubuntu
-building design/assistant/comment_20_099da245e3276fa84f5e14312d186621._comment, which links to install/OSX
 building install/fromsource/comment_10_7ebe353b05d4df29897dc9a4f45c8a91._comment, which links to install/OSX
+building design/assistant/comment_20_099da245e3276fa84f5e14312d186621._comment, which links to install/OSX
 building install/Debian/comment_8_5b5a3b0e8abe8831a6a15a4e258d14fd._comment, which links to install/Linux_standalone
 building special_remotes/adb/comment_2_f1f6c0a6f8c34c3d205988d2f69693ea._comment, which links to install/Android
 building install/OSX/comment_2_25552ff2942048fafe97d653757f1ad6._comment, which links to install/OSX/old_comments
-building git-annex-addurl/comment_14_5719924fbda2daabe83ef2fde447d620._comment, which links to design/external_special_remote_protocol
 building special_remotes/comment_41_26a29fe6169eee1c62dd10672040851c._comment, which links to design/external_special_remote_protocol
+building git-annex-addurl/comment_14_5719924fbda2daabe83ef2fde447d620._comment, which links to design/external_special_remote_protocol
 building design/assistant/sshpassword/comment_2_36a811bca209c7ac8a44d64bf8bc5bf3._comment, which links to design/assistant/gpgkeys
 building design/assistant/comment_15_68c98a27083567f20c2e6bc2a760991b._comment, which links to design/assistant/cloud
 building design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment, which links to assistant/local_pairing_walkthrough
 done
-[146 of 756] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o, dist/build/git-annex/git-annex-tmp/Types/UrlContents.dyn_o )
-[147 of 756] Compiling Utility.Rsync    ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o, dist/build/git-annex/git-annex-tmp/Utility/Rsync.dyn_o )
-[148 of 756] Compiling Types.Messages   ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o, dist/build/git-annex/git-annex-tmp/Types/Messages.dyn_o )
-[149 of 756] Compiling Utility.Matcher  ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o, dist/build/git-annex/git-annex-tmp/Utility/Matcher.dyn_o )
-[150 of 756] Compiling Utility.Lsof     ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o, dist/build/git-annex/git-annex-tmp/Utility/Lsof.dyn_o )
-[151 of 756] Compiling Utility.LogFile  ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o, dist/build/git-annex/git-annex-tmp/Utility/LogFile.dyn_o )
-[152 of 756] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.dyn_o )
-[153 of 756] Compiling Types.KeySource  ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o, dist/build/git-annex/git-annex-tmp/Types/KeySource.dyn_o )
-[154 of 756] Compiling Types.Backend    ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o, dist/build/git-annex/git-annex-tmp/Types/Backend.dyn_o )
-[155 of 756] Compiling Database.Handle  ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o, dist/build/git-annex/git-annex-tmp/Database/Handle.dyn_o )
-[156 of 756] Compiling Database.RepoSize.Handle ( Database/RepoSize/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/RepoSize/Handle.o, dist/build/git-annex/git-annex-tmp/Database/RepoSize/Handle.dyn_o )
-[157 of 756] Compiling Database.Queue   ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o, dist/build/git-annex/git-annex-tmp/Database/Queue.dyn_o )
-[158 of 756] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.dyn_o )
-[159 of 756] Compiling Utility.Gpg      ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o, dist/build/git-annex/git-annex-tmp/Utility/Gpg.dyn_o )
-[160 of 756] Compiling Types.Crypto     ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o, dist/build/git-annex/git-annex-tmp/Types/Crypto.dyn_o )
-[161 of 756] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.dyn_o )
-[162 of 756] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.dyn_o )
-[163 of 756] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.dyn_o )
-[164 of 756] Compiling Utility.Daemon   ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o, dist/build/git-annex/git-annex-tmp/Utility/Daemon.dyn_o )
-[165 of 756] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.dyn_o )
-[166 of 756] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.dyn_o )
-[167 of 756] Compiling Utility.Batch    ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o, dist/build/git-annex/git-annex-tmp/Utility/Batch.dyn_o )
-[168 of 756] Compiling Utility.Android  ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o, dist/build/git-annex/git-annex-tmp/Utility/Android.dyn_o )
-[169 of 756] Compiling Types.UUID       ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o, dist/build/git-annex/git-annex-tmp/Types/UUID.dyn_o )
-[170 of 756] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.dyn_o )
-[171 of 756] Compiling Types.RepoSize   ( Types/RepoSize.hs, dist/build/git-annex/git-annex-tmp/Types/RepoSize.o, dist/build/git-annex/git-annex-tmp/Types/RepoSize.dyn_o )
-[172 of 756] Compiling Types.RemoteState ( Types/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteState.o, dist/build/git-annex/git-annex-tmp/Types/RemoteState.dyn_o )
-[173 of 756] Compiling Types.NumCopies  ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o, dist/build/git-annex/git-annex-tmp/Types/NumCopies.dyn_o )
-[174 of 756] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.dyn_o )
-[175 of 756] Compiling Types.Cluster    ( Types/Cluster.hs, dist/build/git-annex/git-annex-tmp/Types/Cluster.o, dist/build/git-annex/git-annex-tmp/Types/Cluster.dyn_o )
-[176 of 756] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.dyn_o )
-[177 of 756] Compiling Types.TransferrerPool ( Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Types/TransferrerPool.o, dist/build/git-annex/git-annex-tmp/Types/TransferrerPool.dyn_o )
-[178 of 756] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.dyn_o )
-[179 of 756] Compiling Types.RefSpec    ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o, dist/build/git-annex/git-annex-tmp/Types/RefSpec.dyn_o )
-[180 of 756] Compiling Types.MetaData   ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o, dist/build/git-annex/git-annex-tmp/Types/MetaData.dyn_o )
 [181 of 756] Compiling Annex.MetaData.StandardFields ( Annex/MetaData/StandardFields.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.o, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.dyn_o )
 [182 of 756] Compiling Logs.Line        ( Logs/Line.hs, dist/build/git-annex/git-annex-tmp/Logs/Line.o, dist/build/git-annex/git-annex-tmp/Logs/Line.dyn_o )
 [183 of 756] Compiling Key              ( Key.hs, dist/build/git-annex/git-annex-tmp/Key.o, dist/build/git-annex/git-annex-tmp/Key.dyn_o )
@@ -4479,277 +4515,27 @@
     |  ^
 ./git-annex test
 Tests
-  QuickCheck
-    prop_quote_unquote_roundtrip:            OK (0.13s)
-      +++ OK, passed 1000 tests.
-    prop_encode_c_decode_c_roundtrip:        OK (0.04s)
-      +++ OK, passed 1000 tests.
-    prop_isomorphic_key_encode:              OK (0.02s)
-      +++ OK, passed 1000 tests.
-    prop_isomorphic_shellEscape:             OK (0.02s)
-      +++ OK, passed 1000 tests.
-    prop_isomorphic_shellEscape_multiword:   OK (0.51s)
-      +++ OK, passed 1000 tests.
-    prop_isomorphic_configEscape:            OK (0.02s)
-      +++ OK, passed 1000 tests.
-    prop_parse_show_Config:                  OK (0.03s)
-      +++ OK, passed 1000 tests.
-    prop_upFrom_basics:                      OK (0.01s)
-      +++ OK, passed 1000 tests.
-    prop_relPathDirToFileAbs_basics:         OK (0.01s)
-      +++ OK, passed 1000 tests.
-    prop_relPathDirToFileAbs_regressionTest: OK
-      +++ OK, passed 1 test.
-    prop_dirContains_regressionTest:         OK
-      +++ OK, passed 1 test.
-    prop_cost_sane:                          OK
-      +++ OK, passed 1 test.
-    prop_matcher_sane:                       OK
-      +++ OK, passed 1 test.
-    prop_HmacSha1WithCipher_sane:            OK
-      +++ OK, passed 1 test.
-    prop_VectorClock_sane:                   OK
-      +++ OK, passed 1 test.
-    prop_addMapLog_sane:                     OK
-      +++ OK, passed 1 test.
-    prop_verifiable_sane:                    OK (0.06s)
-      +++ OK, passed 1000 tests.
-    prop_segment_regressionTest:             OK
-      +++ OK, passed 1 test.
-    prop_read_write_transferinfo:            OK (0.03s)
-      +++ OK, passed 1000 tests.
-    prop_read_show_inodecache:               OK (0.01s)
-      +++ OK, passed 1000 tests.
-    prop_parse_build_presence_log:           OK (1.23s)
-      +++ OK, passed 1000 tests.
-    prop_parse_build_contentidentifier_log:  OK (1.36s)
-      +++ OK, passed 1000 tests.
-    prop_read_show_TrustLevel:               OK
-      +++ OK, passed 1 test.
-    prop_parse_build_TrustLevelLog:          OK
-      +++ OK, passed 1 test.
-    prop_schedule_roundtrips:                OK
-      +++ OK, passed 1000 tests.
-    prop_past_sane:                          OK
-      +++ OK, passed 1 test.
-    prop_duration_roundtrips:                OK
-      +++ OK, passed 1000 tests.
-    prop_metadata_sane:                      OK (0.83s)
-      +++ OK, passed 1000 tests.
-    prop_metadata_serialize:                 OK (0.62s)
-      +++ OK, passed 1000 tests.
-    prop_branchView_legal:                   OK (0.52s)
-      +++ OK, passed 1000 tests.
-    prop_viewPath_roundtrips:                OK (0.02s)
-      +++ OK, passed 1000 tests.
-    prop_view_roundtrips:                    OK (0.22s)
-      +++ OK, passed 1000 tests.
-    prop_viewedFile_rountrips:               OK (0.02s)
-      +++ OK, passed 1000 tests.
-    prop_standardGroups_parse:               OK
-      +++ OK, passed 1 test.
-    prop_balanced_stable:                    OK
-      +++ OK, passed 1 test.
-    sha1 stable:                             OK
-      +++ OK, passed 1 test.
-    sha2_224 stable:                         OK
-      +++ OK, passed 1 test.
-    sha2_256 stable:                         OK
-      +++ OK, passed 1 test.
-    sha2_384 stable:                         OK
-      +++ OK, passed 1 test.
-    sha2_512 stable:                         OK
-      +++ OK, passed 1 test.
-    skein256 stable:                         OK
-      +++ OK, passed 1 test.
-    skein512 stable:                         OK
-      +++ OK, passed 1 test.
-    sha3_224 stable:                         OK
-      +++ OK, passed 1 test.
-    sha3_256 stable:                         OK
-      +++ OK, passed 1 test.
-    sha3_384 stable:                         OK
-      +++ OK, passed 1 test.
-    sha3_512 stable:                         OK
-      +++ OK, passed 1 test.
-    blake2s_160 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2s_224 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2s_256 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2sp_224 stable:                     OK
-      +++ OK, passed 1 test.
-    blake2sp_256 stable:                     OK
-      +++ OK, passed 1 test.
-    blake2b_160 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2b_224 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2b_256 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2b_384 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2b_512 stable:                      OK
-      +++ OK, passed 1 test.
-    blake2bp_512 stable:                     OK
-      +++ OK, passed 1 test.
-    md5 stable:                              OK
-      +++ OK, passed 1 test.
-    HmacSha1 stable:                         OK
-      +++ OK, passed 1 test.
-    HmacSha224 stable:                       OK
-      +++ OK, passed 1 test.
-    HmacSha256 stable:                       OK
-      +++ OK, passed 1 test.
-    HmacSha384 stable:                       OK
-      +++ OK, passed 1 test.
-    HmacSha512 stable:                       OK
-      +++ OK, passed 1 test.
-
-All 63 tests passed (5.74s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                               OK (0.35s)
-      add:                                OK (0.60s)
-    uninit:                               OK (0.76s)
-    concurrent get of dup key regression: OK (2.04s)
-    fsck (basics):                        OK (2.09s)
-    drop (no remote):                     OK (0.81s)
-    add moved link:                       OK (0.71s)
-
-All 7 tests passed (7.38s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                       OK (0.35s)
-      add:                        OK (0.55s)
-    uninit (in git-annex branch): OK (0.41s)
-    union merge regression:       OK (6.43s)
-    fsck (bare):                  OK (0.18s)
-    drop (with remote):           OK (0.93s)
-    git-remote-annex:             OK (1.33s)
-
-All 7 tests passed (10.18s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                             OK (0.38s)
-      add:                              OK (0.55s)
-    whereis:                            OK (1.29s)
-    adjusted branch subtree regression: OK (2.30s)
-    fsck (remote untrusted):            OK (1.35s)
-    get:                                OK (0.76s)
-    readonly remote:                    OK (1.57s)
-
-All 7 tests passed (8.21s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                           OK (0.35s)
-      add:                            OK (0.60s)
-    upgrade:                          OK (0.32s)
-    adjusted branch merge regression: OK (5.12s)
-    fsck (local untrusted):           OK (0.85s)
-    drop (untrusted remote):          OK (0.76s)
-    git-remote-annex exporttree:      OK (1.21s)
-
-All 7 tests passed (9.21s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                 OK (0.37s)
-      add:                  OK (0.58s)
-    hook remote:            OK (1.88s)
-    transition propagation: OK (5.42s)
-    fsck --from remote:     OK (0.40s)
-    get (ssh remote):       OK (0.83s)
-    ignore deleted files:   OK (0.57s)
-
-All 7 tests passed (10.05s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                    OK (0.34s)
-      add:                     OK (0.58s)
-    directory remote:          OK (1.86s)
-    conflict resolution:       OK (4.79s)
-    conversion git to annexed: OK (0.67s)
-    move:                      OK (1.33s)
-    metadata:                  OK (1.66s)
-
-All 7 tests passed (11.22s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                                OK (0.39s)
-      add:                                 OK (0.55s)
-    bup remote:                            OK (0.33s)
-    conflict resolution movein regression: OK (5.69s)
-    migrate:                               OK (1.42s)
-    move (numcopies):                      OK (1.28s)
-    export and import of subdir:           OK (3.88s)
-
-All 7 tests passed (13.53s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                                OK (0.34s)
-      add:                                 OK (0.57s)
-    rsync remote:                          OK (2.81s)
-    conflict resolution (adjusted branch): OK (4.56s)
-    conversion annexed to git:             OK (0.86s)
-    move (ssh remote):                     OK (1.57s)
-    export and import:                     OK (6.26s)
-
-All 7 tests passed (16.97s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                                       OK (0.26s)
-      add:                                        OK (0.48s)
-    sop crypto:                                   OK
-    conflict resolution (uncommitted local file): OK (3.95s)
-    describe:                                     OK (0.98s)
-    lock --force:                                 OK (1.29s)
-    view:                                         OK (1.17s)
-
-All 7 tests passed (8.14s)
-Tests
-  Repo Tests v10 adjusted unlocked branch
-    Init Tests
-      init:                                         OK (0.37s)
-      add:                                          OK (0.58s)
-    borg remote:                                    OK
-    conflict resolution (mixed directory and file): OK (8.58s)
-    migrate (via gitattributes):                    OK (2.57s)
-    copy:                                           OK (2.21s)
-    shared clone:                                   OK (0.73s)
-
-All 7 tests passed (15.04s)
-Tests
   Remote Tests
     testremote type git
-      init:                                              OK (0.57s)
+      init:                                              OK (0.55s)
       unavailable remote
         removeKey:                                       OK
         storeKey:                                        OK
         checkPresent:                                    OK
-        retrieveKeyFile:                                 OK (0.01s)
+        retrieveKeyFile:                                 OK
         retrieveKeyFileCheap:                            OK
       key size 1048576; git remote
         removeKey when not present:                      OK
         present False:                                   OK
         storeKey:                                        OK (0.03s)
         present True:                                    OK
-        storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.01s)
+        storeKey when already present:                   OK
+        present True:                                    OK
         retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 0:                   OK (0.02s)
+        retrieveKeyFile resume from 0:                   OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 33%:                 OK (0.03s)
+        retrieveKeyFile resume from 33%:                 OK (0.02s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
@@ -4762,12 +4548,12 @@
         present True:                                    OK
         storeKey when already present:                   OK
         present True:                                    OK
-        retrieveKeyFile:                                 OK (0.03s)
+        retrieveKeyFile:                                 OK (0.04s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.02s)
         fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from 33%:                 OK (0.03s)
-        fsck downloaded object:                          OK
+        fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.02s)
         fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK
@@ -4781,7 +4567,7 @@
         present True:                                    OK
         retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 0:                   OK (0.03s)
+        retrieveKeyFile resume from 0:                   OK (0.02s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
@@ -4790,35 +4576,35 @@
         removeKey when present:                          OK
         present False:                                   OK
       key size 2097152; git remote
-        removeKey when not present:                      OK (0.01s)
+        removeKey when not present:                      OK
         present False:                                   OK
-        storeKey:                                        OK (0.10s)
+        storeKey:                                        OK (0.04s)
         present True:                                    OK
         storeKey when already present:                   OK
         present True:                                    OK
-        retrieveKeyFile:                                 OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.08s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.07s)
+        retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        removeKey when present:                          OK (0.01s)
+        retrieveKeyFile resume from 0:                   OK (0.04s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 33%:                 OK (0.04s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.05s)
+        fsck downloaded object:                          OK (0.02s)
+        removeKey when present:                          OK
         present False:                                   OK
       exporttree=yes; key size 1048576; key size 2097152
         check present export when not present:           OK
         remove export when not present:                  OK
         store export:                                    OK
         check present export after store:                OK
-        store export when already present:               OK (0.01s)
+        store export when already present:               OK
         retrieve export:                                 OK
         store new content to export:                     OK
         check present export after store of new content: OK
         retrieve export new content:                     OK
-        remove export:                                   OK (0.01s)
-        check present export after remove:               OK (0.01s)
-        retrieve export fails after removal:             OK (0.01s)
+        remove export:                                   OK
+        check present export after remove:               OK
+        retrieve export fails after removal:             OK
         remove export directory:                         OK
         remove export directory that is already removed: OK
       exporttree=yes; key size 1048576; key size 1048575
@@ -4829,7 +4615,7 @@
         store export when already present:               OK
         retrieve export:                                 OK
         store new content to export:                     OK
-        check present export after store of new content: OK (0.01s)
+        check present export after store of new content: OK
         retrieve export new content:                     OK
         remove export:                                   OK
         check present export after remove:               OK
@@ -4837,139 +4623,139 @@
         remove export directory:                         OK
         remove export directory that is already removed: OK
       exporttree=yes; key size 1048577; key size 2097152
-        check present export when not present:           OK (0.01s)
+        check present export when not present:           OK
         remove export when not present:                  OK
         store export:                                    OK
-        check present export after store:                OK (0.01s)
+        check present export after store:                OK
         store export when already present:               OK
         retrieve export:                                 OK
         store new content to export:                     OK
-        check present export after store of new content: OK (0.01s)
-        retrieve export new content:                     OK (0.02s)
+        check present export after store of new content: OK
+        retrieve export new content:                     OK
         remove export:                                   OK
-        check present export after remove:               OK
-        retrieve export fails after removal:             OK (0.01s)
+        check present export after remove:               OK (0.02s)
+        retrieve export fails after removal:             OK
         remove export directory:                         OK
-        remove export directory that is already removed: OK (0.01s)
+        remove export directory that is already removed: OK
       exporttree=yes; key size 1048577; key size 1048575
-        check present export when not present:           OK (0.02s)
+        check present export when not present:           OK
         remove export when not present:                  OK
         store export:                                    OK
         check present export after store:                OK
         store export when already present:               OK
         retrieve export:                                 OK
-        store new content to export:                     OK (0.01s)
-        check present export after store of new content: OK (0.01s)
+        store new content to export:                     OK
+        check present export after store of new content: OK
         retrieve export new content:                     OK
-        remove export:                                   OK (0.02s)
-        check present export after remove:               OK (0.01s)
+        remove export:                                   OK
+        check present export after remove:               OK
         retrieve export fails after removal:             OK
-        remove export directory:                         OK (0.01s)
+        remove export directory:                         OK
         remove export directory that is already removed: OK
     testremote type directory
-      init:                                              OK (0.64s)
+      init:                                              OK (0.37s)
       unavailable remote
-        removeKey:                                       OK (0.02s)
+        removeKey:                                       OK (0.01s)
         storeKey:                                        OK (0.01s)
-        checkPresent:                                    OK (0.03s)
-        retrieveKeyFile:                                 OK (0.03s)
+        checkPresent:                                    OK (0.01s)
+        retrieveKeyFile:                                 OK (0.01s)
         retrieveKeyFileCheap:                            OK
       key size 1048576; directory remote chunksize=0 encryption=none
-        removeKey when not present:                      OK (0.03s)
-        present False:                                   OK (0.03s)
-        storeKey:                                        OK (0.02s)
+        removeKey when not present:                      OK (0.01s)
+        present False:                                   OK (0.01s)
+        storeKey:                                        OK (0.01s)
         present True:                                    OK
-        storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.01s)
-        retrieveKeyFile:                                 OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.06s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.06s)
-        present False:                                   OK (0.03s)
+        storeKey when already present:                   OK
+        present True:                                    OK
+        retrieveKeyFile:                                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 0:                   OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 33%:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK
+        removeKey when present:                          OK (0.03s)
+        present False:                                   OK (0.02s)
       key size 1048576; directory remote chunksize=0 encryption=shared
-        removeKey when not present:                      OK (0.03s)
-        present False:                                   OK (0.03s)
-        storeKey:                                        OK (0.02s)
-        present True:                                    OK (0.01s)
+        removeKey when not present:                      OK
+        present False:                                   OK (0.01s)
+        storeKey:                                        OK (0.01s)
+        present True:                                    OK
         storeKey when already present:                   OK
-        present True:                                    OK (0.02s)
-        retrieveKeyFile:                                 OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.06s)
+        present True:                                    OK
+        retrieveKeyFile:                                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 0:                   OK (0.03s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
+        retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        removeKey when present:                          OK (0.05s)
-        present False:                                   OK (0.05s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.01s)
+        present False:                                   OK (0.01s)
       key size 1048576; directory remote chunksize=10485 encryption=none
         removeKey when not present:                      OK (0.04s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.10s)
-        present True:                                    OK (0.08s)
-        storeKey when already present:                   OK (0.03s)
-        present True:                                    OK (0.07s)
-        retrieveKeyFile:                                 OK (0.08s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.07s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.03s)
-        removeKey when present:                          OK (0.04s)
-        present False:                                   OK (0.06s)
-      key size 1048576; directory remote chunksize=10485 encryption=shared
-        removeKey when not present:                      OK (0.06s)
-        present False:                                   OK (0.05s)
-        storeKey:                                        OK (0.07s)
-        present True:                                    OK (0.06s)
-        storeKey when already present:                   OK (0.03s)
-        present True:                                    OK (0.06s)
-        retrieveKeyFile:                                 OK (0.06s)
+        present False:                                   OK (0.03s)
+        storeKey:                                        OK (0.05s)
+        present True:                                    OK (0.04s)
+        storeKey when already present:                   OK (0.02s)
+        present True:                                    OK (0.03s)
+        retrieveKeyFile:                                 OK (0.04s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 0:                   OK (0.05s)
+        retrieveKeyFile resume from 0:                   OK (0.04s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.04s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.03s)
-        fsck downloaded object:                          OK
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.03s)
+        present False:                                   OK (0.03s)
+      key size 1048576; directory remote chunksize=10485 encryption=shared
+        removeKey when not present:                      OK (0.04s)
+        present False:                                   OK (0.02s)
+        storeKey:                                        OK (0.06s)
+        present True:                                    OK (0.03s)
+        storeKey when already present:                   OK (0.01s)
+        present True:                                    OK (0.04s)
+        retrieveKeyFile:                                 OK (0.04s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 0:                   OK (0.03s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 33%:                 OK (0.04s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK (0.03s)
         present False:                                   OK (0.03s)
       key size 1048576; directory remote chunksize=1048 encryption=none
-        removeKey when not present:                      OK (0.12s)
+        removeKey when not present:                      OK (0.11s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.34s)
-        present True:                                    OK (0.07s)
+        present True:                                    OK (0.08s)
         storeKey when already present:                   OK (0.05s)
         present True:                                    OK (0.07s)
-        retrieveKeyFile:                                 OK (0.12s)
+        retrieveKeyFile:                                 OK (0.10s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.11s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 33%:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 33%:                 OK (0.09s)
+        fsck downloaded object:                          OK
         retrieveKeyFile resume from end:                 OK (0.03s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.12s)
-        present False:                                   OK (0.04s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.11s)
+        present False:                                   OK (0.03s)
       key size 1048576; directory remote chunksize=1048 encryption=shared
-        removeKey when not present:                      OK (0.10s)
+        removeKey when not present:                      OK (0.12s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.35s)
-        present True:                                    OK (0.07s)
-        storeKey when already present:                   OK (0.04s)
+        present True:                                    OK (0.08s)
+        storeKey when already present:                   OK (0.05s)
         present True:                                    OK (0.07s)
         retrieveKeyFile:                                 OK (0.10s)
-        fsck downloaded object:                          OK (0.01s)
+        fsck downloaded object:                          OK
         retrieveKeyFile resume from 0:                   OK (0.11s)
-        fsck downloaded object:                          OK (0.02s)
+        fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.08s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.03s)
@@ -4977,58 +4763,58 @@
         removeKey when present:                          OK (0.11s)
         present False:                                   OK (0.03s)
       key size 1048576; directory remote chunksize=1048576 encryption=none
-        removeKey when not present:                      OK (0.02s)
+        removeKey when not present:                      OK (0.01s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.02s)
-        present True:                                    OK (0.05s)
+        present True:                                    OK (0.03s)
         storeKey when already present:                   OK (0.01s)
-        present True:                                    OK (0.04s)
+        present True:                                    OK (0.03s)
         retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.03s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        removeKey when present:                          OK (0.01s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK
+        removeKey when present:                          OK (0.02s)
         present False:                                   OK (0.03s)
       key size 1048576; directory remote chunksize=1048576 encryption=shared
         removeKey when not present:                      OK (0.02s)
         present False:                                   OK (0.02s)
         storeKey:                                        OK (0.01s)
-        present True:                                    OK (0.03s)
-        storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.03s)
+        present True:                                    OK (0.05s)
+        storeKey when already present:                   OK (0.01s)
+        present True:                                    OK (0.04s)
         retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from end:                 OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        removeKey when present:                          OK (0.02s)
+        removeKey when present:                          OK (0.01s)
         present False:                                   OK (0.03s)
       key size 1048577; directory remote chunksize=0 encryption=none
         removeKey when not present:                      OK (0.02s)
-        present False:                                   OK (0.02s)
+        present False:                                   OK (0.01s)
         storeKey:                                        OK
-        present True:                                    OK (0.01s)
+        present True:                                    OK
         storeKey when already present:                   OK
         present True:                                    OK
-        retrieveKeyFile:                                 OK (0.02s)
+        retrieveKeyFile:                                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 0:                   OK (0.03s)
+        retrieveKeyFile resume from 0:                   OK (0.02s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.03s)
-        fsck downloaded object:                          OK
+        fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK (0.03s)
         present False:                                   OK (0.02s)
       key size 1048577; directory remote chunksize=0 encryption=shared
-        removeKey when not present:                      OK (0.02s)
+        removeKey when not present:                      OK (0.01s)
         present False:                                   OK (0.02s)
         storeKey:                                        OK
         present True:                                    OK
@@ -5037,251 +4823,251 @@
         retrieveKeyFile:                                 OK (0.02s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.03s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from end:                 OK (0.03s)
+        retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK (0.01s)
         present False:                                   OK (0.01s)
       key size 1048577; directory remote chunksize=10485 encryption=none
-        removeKey when not present:                      OK (0.03s)
+        removeKey when not present:                      OK (0.02s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.06s)
-        present True:                                    OK (0.04s)
+        present True:                                    OK (0.03s)
         storeKey when already present:                   OK (0.02s)
         present True:                                    OK (0.04s)
         retrieveKeyFile:                                 OK (0.05s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 0:                   OK (0.04s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 33%:                 OK (0.05s)
         fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.04s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.03s)
+        present False:                                   OK (0.03s)
+      key size 1048577; directory remote chunksize=10485 encryption=shared
+        removeKey when not present:                      OK (0.04s)
+        present False:                                   OK (0.03s)
+        storeKey:                                        OK (0.06s)
+        present True:                                    OK (0.03s)
+        storeKey when already present:                   OK (0.02s)
+        present True:                                    OK (0.05s)
+        retrieveKeyFile:                                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 0:                   OK (0.05s)
+        fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from 33%:                 OK (0.04s)
         fsck downloaded object:                          OK (0.01s)
         retrieveKeyFile resume from end:                 OK (0.03s)
         fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK (0.03s)
-        present False:                                   OK (0.04s)
-      key size 1048577; directory remote chunksize=10485 encryption=shared
-        removeKey when not present:                      OK (0.07s)
-        present False:                                   OK (0.07s)
-        storeKey:                                        OK (0.10s)
-        present True:                                    OK (0.08s)
-        storeKey when already present:                   OK (0.04s)
-        present True:                                    OK (0.09s)
-        retrieveKeyFile:                                 OK (0.07s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.07s)
+        present False:                                   OK (0.03s)
+      key size 1048577; directory remote chunksize=1048 encryption=none
+        removeKey when not present:                      OK (0.11s)
+        present False:                                   OK (0.03s)
+        storeKey:                                        OK (0.40s)
+        present True:                                    OK (0.10s)
+        storeKey when already present:                   OK (0.06s)
+        present True:                                    OK (0.12s)
+        retrieveKeyFile:                                 OK (0.15s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.08s)
+        retrieveKeyFile resume from 0:                   OK (0.20s)
+        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from 33%:                 OK (0.18s)
         fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from end:                 OK (0.06s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.07s)
-        present False:                                   OK (0.07s)
-      key size 1048577; directory remote chunksize=1048 encryption=none
-        removeKey when not present:                      OK (0.21s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.65s)
-        present True:                                    OK (0.13s)
-        storeKey when already present:                   OK (0.07s)
-        present True:                                    OK (0.15s)
-        retrieveKeyFile:                                 OK (0.19s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.15s)
-        fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 33%:                 OK (0.17s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.22s)
-        present False:                                   OK (0.06s)
+        removeKey when present:                          OK (0.15s)
+        present False:                                   OK (0.07s)
       key size 1048577; directory remote chunksize=1048 encryption=shared
         removeKey when not present:                      OK (0.25s)
         present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.68s)
+        storeKey:                                        OK (0.61s)
         present True:                                    OK (0.17s)
-        storeKey when already present:                   OK (0.08s)
-        present True:                                    OK (0.16s)
-        retrieveKeyFile:                                 OK (0.31s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.24s)
+        storeKey when already present:                   OK (0.10s)
+        present True:                                    OK (0.11s)
+        retrieveKeyFile:                                 OK (0.23s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.21s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.03s)
-        removeKey when present:                          OK (0.21s)
-        present False:                                   OK (0.07s)
+        retrieveKeyFile resume from 0:                   OK (0.22s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 33%:                 OK (0.15s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.06s)
+        fsck downloaded object:                          OK (0.02s)
+        removeKey when present:                          OK (0.19s)
+        present False:                                   OK (0.05s)
       key size 1048577; directory remote chunksize=1048576 encryption=none
-        removeKey when not present:                      OK (0.03s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.04s)
-        present True:                                    OK (0.08s)
-        storeKey when already present:                   OK (0.04s)
+        removeKey when not present:                      OK (0.04s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (0.03s)
         present True:                                    OK (0.06s)
-        retrieveKeyFile:                                 OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.04s)
-        present False:                                   OK (0.08s)
-      key size 1048577; directory remote chunksize=1048576 encryption=shared
-        removeKey when not present:                      OK (0.03s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.02s)
-        present True:                                    OK (0.08s)
         storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.09s)
-        retrieveKeyFile:                                 OK (0.05s)
+        present True:                                    OK (0.07s)
+        retrieveKeyFile:                                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.05s)
+        retrieveKeyFile resume from 0:                   OK (0.07s)
         fsck downloaded object:                          OK (0.03s)
         retrieveKeyFile resume from 33%:                 OK (0.05s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.07s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.02s)
+        present False:                                   OK (0.03s)
+      key size 1048577; directory remote chunksize=1048576 encryption=shared
+        removeKey when not present:                      OK (0.01s)
+        present False:                                   OK (0.03s)
+        storeKey:                                        OK (0.01s)
+        present True:                                    OK (0.03s)
+        storeKey when already present:                   OK (0.01s)
+        present True:                                    OK (0.04s)
+        retrieveKeyFile:                                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from 0:                   OK (0.03s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 33%:                 OK (0.03s)
         fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.03s)
+        fsck downloaded object:                          OK (0.01s)
         removeKey when present:                          OK (0.02s)
-        present False:                                   OK (0.06s)
+        present False:                                   OK (0.03s)
       key size 1048575; directory remote chunksize=0 encryption=none
-        removeKey when not present:                      OK (0.03s)
+        removeKey when not present:                      OK (0.04s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.02s)
-        present True:                                    OK
-        storeKey when already present:                   OK (0.02s)
+        present True:                                    OK (0.01s)
+        storeKey when already present:                   OK (0.03s)
         present True:                                    OK (0.02s)
-        retrieveKeyFile:                                 OK (0.04s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.06s)
+        retrieveKeyFile:                                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 0:                   OK (0.05s)
+        fsck downloaded object:                          OK (0.03s)
         retrieveKeyFile resume from 33%:                 OK (0.04s)
-        fsck downloaded object:                          OK (0.02s)
+        fsck downloaded object:                          OK
         retrieveKeyFile resume from end:                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.06s)
+        removeKey when present:                          OK (0.05s)
         present False:                                   OK (0.03s)
       key size 1048575; directory remote chunksize=0 encryption=shared
-        removeKey when not present:                      OK (0.02s)
+        removeKey when not present:                      OK (0.03s)
         present False:                                   OK (0.03s)
         storeKey:                                        OK (0.02s)
         present True:                                    OK (0.01s)
-        storeKey when already present:                   OK (0.01s)
+        storeKey when already present:                   OK (0.02s)
         present True:                                    OK (0.02s)
         retrieveKeyFile:                                 OK (0.05s)
         fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from 0:                   OK (0.05s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.07s)
+        retrieveKeyFile resume from 33%:                 OK (0.06s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.02s)
-        present False:                                   OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.06s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.03s)
+        present False:                                   OK (0.03s)
       key size 1048575; directory remote chunksize=10485 encryption=none
-        removeKey when not present:                      OK (0.04s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.09s)
-        present True:                                    OK (0.08s)
-        storeKey when already present:                   OK (0.04s)
+        removeKey when not present:                      OK (0.05s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (0.10s)
         present True:                                    OK (0.07s)
-        retrieveKeyFile:                                 OK (0.10s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.11s)
+        storeKey when already present:                   OK (0.04s)
+        present True:                                    OK (0.09s)
+        retrieveKeyFile:                                 OK (0.08s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 0:                   OK (0.07s)
         fsck downloaded object:                          OK (0.03s)
         retrieveKeyFile resume from 33%:                 OK (0.08s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.06s)
+        retrieveKeyFile resume from end:                 OK (0.05s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.06s)
-        present False:                                   OK (0.07s)
+        removeKey when present:                          OK (0.05s)
+        present False:                                   OK (0.08s)
       key size 1048575; directory remote chunksize=10485 encryption=shared
         removeKey when not present:                      OK (0.06s)
-        present False:                                   OK (0.09s)
-        storeKey:                                        OK (0.11s)
-        present True:                                    OK (0.10s)
-        storeKey when already present:                   OK (0.03s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (0.10s)
         present True:                                    OK (0.08s)
-        retrieveKeyFile:                                 OK (0.08s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.08s)
+        storeKey when already present:                   OK (0.04s)
+        present True:                                    OK (0.06s)
+        retrieveKeyFile:                                 OK (0.11s)
+        fsck downloaded object:                          OK (0.04s)
+        retrieveKeyFile resume from 0:                   OK (0.07s)
         fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from 33%:                 OK (0.08s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from end:                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.04s)
-        present False:                                   OK (0.05s)
+        removeKey when present:                          OK (0.06s)
+        present False:                                   OK (0.04s)
       key size 1048575; directory remote chunksize=1048 encryption=none
-        removeKey when not present:                      OK (0.21s)
-        present False:                                   OK (0.07s)
-        storeKey:                                        OK (0.86s)
-        present True:                                    OK (0.14s)
-        storeKey when already present:                   OK (0.12s)
-        present True:                                    OK (0.13s)
-        retrieveKeyFile:                                 OK (0.27s)
-        fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 0:                   OK (0.25s)
-        fsck downloaded object:                          OK (0.01s)
-        retrieveKeyFile resume from 33%:                 OK (0.13s)
+        removeKey when not present:                      OK (0.19s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (0.58s)
+        present True:                                    OK (0.12s)
+        storeKey when already present:                   OK (0.08s)
+        present True:                                    OK (0.12s)
+        retrieveKeyFile:                                 OK (0.21s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.06s)
+        retrieveKeyFile resume from 0:                   OK (0.16s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.16s)
-        present False:                                   OK (0.07s)
+        retrieveKeyFile resume from 33%:                 OK (0.13s)
+        fsck downloaded object:                          OK (0.01s)
+        retrieveKeyFile resume from end:                 OK (0.04s)
+        fsck downloaded object:                          OK (0.02s)
+        removeKey when present:                          OK (0.20s)
+        present False:                                   OK (0.06s)
       key size 1048575; directory remote chunksize=1048 encryption=shared
-        removeKey when not present:                      OK (0.24s)
+        removeKey when not present:                      OK (0.20s)
         present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.65s)
-        present True:                                    OK (0.15s)
+        storeKey:                                        OK (0.61s)
+        present True:                                    OK (0.10s)
         storeKey when already present:                   OK (0.09s)
-        present True:                                    OK (0.14s)
-        retrieveKeyFile:                                 OK (0.26s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.21s)
+        present True:                                    OK (0.15s)
+        retrieveKeyFile:                                 OK (0.19s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.18s)
+        retrieveKeyFile resume from 0:                   OK (0.14s)
+        fsck downloaded object:                          OK
+        retrieveKeyFile resume from 33%:                 OK (0.17s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
+        retrieveKeyFile resume from end:                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.22s)
-        present False:                                   OK (0.06s)
+        removeKey when present:                          OK (0.15s)
+        present False:                                   OK (0.05s)
       key size 1048575; directory remote chunksize=1048576 encryption=none
         removeKey when not present:                      OK (0.02s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.02s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (0.04s)
         present True:                                    OK (0.05s)
         storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.07s)
-        retrieveKeyFile:                                 OK (0.05s)
+        present True:                                    OK (0.06s)
+        retrieveKeyFile:                                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from 0:                   OK (0.05s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
+        retrieveKeyFile resume from 33%:                 OK (0.07s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.08s)
+        retrieveKeyFile resume from end:                 OK (0.04s)
         fsck downloaded object:                          OK (0.03s)
         removeKey when present:                          OK (0.03s)
-        present False:                                   OK (0.04s)
+        present False:                                   OK (0.06s)
       key size 1048575; directory remote chunksize=1048576 encryption=shared
         removeKey when not present:                      OK (0.03s)
-        present False:                                   OK (0.05s)
+        present False:                                   OK (0.07s)
         storeKey:                                        OK (0.02s)
-        present True:                                    OK (0.07s)
+        present True:                                    OK (0.06s)
         storeKey when already present:                   OK (0.03s)
         present True:                                    OK (0.05s)
-        retrieveKeyFile:                                 OK (0.05s)
+        retrieveKeyFile:                                 OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 0:                   OK (0.05s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
+        retrieveKeyFile resume from 0:                   OK (0.06s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
+        retrieveKeyFile resume from 33%:                 OK (0.05s)
         fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.02s)
-        present False:                                   OK (0.05s)
+        retrieveKeyFile resume from end:                 OK (0.05s)
+        fsck downloaded object:                          OK (0.01s)
+        removeKey when present:                          OK (0.03s)
+        present False:                                   OK (0.06s)
       key size 2097152; directory remote chunksize=0 encryption=none
         removeKey when not present:                      OK (0.03s)
         present False:                                   OK (0.02s)
@@ -5293,657 +5079,907 @@
         fsck downloaded object:                          OK (0.04s)
         retrieveKeyFile resume from 0:                   OK (0.06s)
         fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 33%:                 OK (0.10s)
-        fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from end:                 OK (0.09s)
+        retrieveKeyFile resume from 33%:                 OK (0.09s)
         fsck downloaded object:                          OK (0.03s)
-        removeKey when present:                          OK (0.06s)
+        retrieveKeyFile resume from end:                 OK (0.08s)
+        fsck downloaded object:                          OK (0.05s)
+        removeKey when present:                          OK (0.04s)
         present False:                                   OK (0.03s)
       key size 2097152; directory remote chunksize=0 encryption=shared
         removeKey when not present:                      OK (0.02s)
-        present False:                                   OK (0.03s)
+        present False:                                   OK (0.02s)
         storeKey:                                        OK (0.02s)
         present True:                                    OK (0.01s)
-        storeKey when already present:                   OK (0.02s)
+        storeKey when already present:                   OK (0.03s)
         present True:                                    OK (0.01s)
-        retrieveKeyFile:                                 OK (0.07s)
-        fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 0:                   OK (0.08s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.07s)
+        retrieveKeyFile:                                 OK (0.04s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from 0:                   OK (0.06s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.10s)
+        retrieveKeyFile resume from 33%:                 OK (0.09s)
+        fsck downloaded object:                          OK (0.02s)
+        retrieveKeyFile resume from end:                 OK (0.08s)
         fsck downloaded object:                          OK (0.03s)
         removeKey when present:                          OK (0.03s)
-        present False:                                   OK (0.03s)
+        present False:                                   OK (0.02s)
       key size 2097152; directory remote chunksize=10485 encryption=none
-        removeKey when not present:                      OK (0.06s)
-        present False:                                   OK (0.07s)
+        removeKey when not present:                      OK (0.07s)
+        present False:                                   OK (0.04s)
         storeKey:                                        OK (0.17s)
-        present True:                                    OK (0.08s)
-        storeKey when already present:                   OK (0.03s)
-        present True:                                    OK (0.09s)
-        retrieveKeyFile:                                 OK (0.10s)
-        fsck downloaded object:                          OK (0.05s)
-        retrieveKeyFile resume from 0:                   OK (0.12s)
+        present True:                                    OK (0.07s)
+        storeKey when already present:                   OK (0.04s)
+        present True:                                    OK (0.07s)
+        retrieveKeyFile:                                 OK (0.09s)
+        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from 0:                   OK (0.09s)
+        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from 33%:                 OK (0.08s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.09s)
-        fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from end:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.02s)
-        removeKey when present:                          OK (0.09s)
-        present False:                                   OK (0.06s)
+        fsck downloaded object:                          OK (0.03s)
+        removeKey when present:                          OK (0.07s)
+        present False:                                   OK (0.05s)
       key size 2097152; directory remote chunksize=10485 encryption=shared
-        removeKey when not present:                      OK (0.08s)
-        present False:                                   OK (0.07s)
-        storeKey:                                        OK (0.22s)
-        present True:                                    OK (0.11s)
+        removeKey when not present:                      OK (0.06s)
+        present False:                                   OK (0.04s)
+        storeKey:                                        OK (0.16s)
+        present True:                                    OK (0.07s)
         storeKey when already present:                   OK (0.03s)
-        present True:                                    OK (0.06s)
-        retrieveKeyFile:                                 OK (0.15s)
-        fsck downloaded object:                          OK (0.04s)
+        present True:                                    OK (0.07s)
+        retrieveKeyFile:                                 OK (0.12s)
+        fsck downloaded object:                          OK (0.03s)
         retrieveKeyFile resume from 0:                   OK (0.08s)
         fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from 33%:                 OK (0.10s)
+        retrieveKeyFile resume from 33%:                 OK (0.07s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.05s)
-        fsck downloaded object:                          OK (0.04s)
-        removeKey when present:                          OK (0.08s)
+        retrieveKeyFile resume from end:                 OK (0.06s)
+        fsck downloaded object:                          OK (0.03s)
+        removeKey when present:                          OK (0.06s)
         present False:                                   OK (0.04s)
       key size 2097152; directory remote chunksize=1048 encryption=none
-        removeKey when not present:                      OK (0.38s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (1.31s)
-        present True:                                    OK (0.16s)
+        removeKey when not present:                      OK (0.29s)
+        present False:                                   OK (0.05s)
+        storeKey:                                        OK (1.05s)
+        present True:                                    OK (0.15s)
         storeKey when already present:                   OK (0.10s)
-        present True:                                    OK (0.19s)
-        retrieveKeyFile:                                 OK (0.28s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.41s)
+        present True:                                    OK (0.15s)
+        retrieveKeyFile:                                 OK (0.32s)
+        fsck downloaded object:                          OK (0.05s)
+        retrieveKeyFile resume from 0:                   OK (0.34s)
         fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 33%:                 OK (0.29s)
+        retrieveKeyFile resume from 33%:                 OK (0.23s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from end:                 OK (0.07s)
-        fsck downloaded object:                          OK (0.04s)
-        removeKey when present:                          OK (0.30s)
-        present False:                                   OK (0.05s)
+        retrieveKeyFile resume from end:                 OK (0.09s)
+        fsck downloaded object:                          OK (0.03s)
+        removeKey when present:                          OK (0.40s)
+        present False:                                   OK (0.08s)
       key size 2097152; directory remote chunksize=1048 encryption=shared
-        removeKey when not present:                      OK (0.34s)
+        removeKey when not present:                      OK (0.29s)
         present False:                                   OK (0.07s)
-        storeKey:                                        OK (1.36s)
-        present True:                                    OK (0.18s)
-        storeKey when already present:                   OK (0.16s)
-        present True:                                    OK (0.17s)
-        retrieveKeyFile:                                 OK (0.42s)
-        fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 0:                   OK (0.38s)
+        storeKey:                                        OK (1.35s)
+        present True:                                    OK (0.19s)
+        storeKey when already present:                   OK (0.20s)
+        present True:                                    OK (0.24s)
+        retrieveKeyFile:                                 OK (0.35s)
         fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 33%:                 OK (0.32s)
-        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from 0:                   OK (0.40s)
+        fsck downloaded object:                          OK (0.06s)
+        retrieveKeyFile resume from 33%:                 OK (0.28s)
+        fsck downloaded object:                          OK (0.07s)
         retrieveKeyFile resume from end:                 OK (0.08s)
         fsck downloaded object:                          OK (0.05s)
-        removeKey when present:                          OK (0.34s)
-        present False:                                   OK (0.06s)
+        removeKey when present:                          OK (0.40s)
+        present False:                                   OK (0.08s)
       key size 2097152; directory remote chunksize=1048576 encryption=none
-        removeKey when not present:                      OK (0.04s)
-        present False:                                   OK (0.05s)
+        removeKey when not present:                      OK (0.03s)
+        present False:                                   OK (0.08s)
         storeKey:                                        OK (0.03s)
         present True:                                    OK (0.07s)
-        storeKey when already present:                   OK (0.02s)
-        present True:                                    OK (0.08s)
-        retrieveKeyFile:                                 OK (0.08s)
-        fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 0:                   OK (0.07s)
+        storeKey when already present:                   OK (0.04s)
+        present True:                                    OK (0.06s)
+        retrieveKeyFile:                                 OK (0.10s)
+        fsck downloaded object:                          OK (0.05s)
+        retrieveKeyFile resume from 0:                   OK (0.08s)
         fsck downloaded object:                          OK (0.04s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
-        fsck downloaded object:                          OK (0.02s)
-        retrieveKeyFile resume from end:                 OK (0.10s)
+        retrieveKeyFile resume from 33%:                 OK (0.09s)
+        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from end:                 OK (0.12s)
         fsck downloaded object:                          OK (0.04s)
-        removeKey when present:                          OK (0.02s)
-        present False:                                   OK (0.06s)
+        removeKey when present:                          OK (0.05s)
+        present False:                                   OK (0.08s)
       key size 2097152; directory remote chunksize=1048576 encryption=shared
         removeKey when not present:                      OK (0.04s)
-        present False:                                   OK (0.06s)
-        storeKey:                                        OK (0.02s)
-        present True:                                    OK (0.07s)
-        storeKey when already present:                   OK (0.01s)
+        present False:                                   OK (0.10s)
+        storeKey:                                        OK (0.03s)
         present True:                                    OK (0.08s)
+        storeKey when already present:                   OK (0.03s)
+        present True:                                    OK (0.09s)
         retrieveKeyFile:                                 OK (0.07s)
         fsck downloaded object:                          OK (0.03s)
         retrieveKeyFile resume from 0:                   OK (0.06s)
         fsck downloaded object:                          OK (0.03s)
-        retrieveKeyFile resume from 33%:                 OK (0.06s)
-        fsck downloaded object:                          OK (0.03s)
+        retrieveKeyFile resume from 33%:                 OK (0.05s)
+        fsck downloaded object:                          OK (0.02s)
         retrieveKeyFile resume from end:                 OK (0.07s)
         fsck downloaded object:                          OK (0.03s)
         removeKey when present:                          OK (0.02s)
-        present False:                                   OK (0.08s)
+        present False:                                   OK (0.07s)
       exporttree=yes; key size 1048576; key size 2097152
-        check present export when not present:           OK (0.01s)
+        check present export when not present:           OK (0.02s)
         remove export when not present:                  OK
         store export:                                    OK
-        check present export after store:                OK (0.01s)
+        check present export after store:                OK
         store export when already present:               OK
-        retrieve export:                                 OK (0.01s)
-        store new content to export:                     OK (0.01s)
-        check present export after store of new content: OK
-        retrieve export new content:                     OK
-        remove export:                                   OK (0.01s)
-        check present export after remove:               OK
-        retrieve export fails after removal:             OK (0.01s)
+        retrieve export:                                 OK
+        store new content to export:                     OK (0.02s)
+        check present export after store of new content: OK (0.01s)
+        retrieve export new content:                     OK (0.01s)
+        remove export:                                   OK
+        check present export after remove:               OK (0.02s)
+        retrieve export fails after removal:             OK
         remove export directory:                         OK
-        remove export directory that is already removed: OK
+        remove export directory that is already removed: OK (0.01s)
       exporttree=yes; key size 1048576; key size 1048575
-        check present export when not present:           OK
+        check present export when not present:           OK (0.02s)
         remove export when not present:                  OK
         store export:                                    OK
-        check present export after store:                OK
+        check present export after store:                OK (0.01s)
         store export when already present:               OK
         retrieve export:                                 OK
-        store new content to export:                     OK
-        check present export after store of new content: OK (0.01s)
+        store new content to export:                     OK (0.02s)
+        check present export after store of new content: OK (0.02s)
         retrieve export new content:                     OK
-        remove export:                                   OK (0.01s)
+        remove export:                                   OK
         check present export after remove:               OK
-        retrieve export fails after removal:             OK (0.02s)
-        remove export directory:                         OK
+        retrieve export fails after removal:             OK
+        remove export directory:                         OK (0.01s)
         remove export directory that is already removed: OK
       exporttree=yes; key size 1048577; key size 2097152
         check present export when not present:           OK
-        remove export when not present:                  OK (0.01s)
-        store export:                                    OK
+        remove export when not present:                  OK
+        store export:                                    OK (0.01s)
         check present export after store:                OK
         store export when already present:               OK (0.01s)
         retrieve export:                                 OK
-        store new content to export:                     OK (0.01s)
-        check present export after store of new content: OK (0.01s)
-        retrieve export new content:                     OK (0.02s)
+        store new content to export:                     OK
+        check present export after store of new content: OK
+        retrieve export new content:                     OK
         remove export:                                   OK (0.01s)
-        check present export after remove:               OK (0.01s)
+        check present export after remove:               OK
         retrieve export fails after removal:             OK
         remove export directory:                         OK
-        remove export directory that is already removed: OK (0.01s)
+        remove export directory that is already removed: OK (0.02s)
       exporttree=yes; key size 1048577; key size 1048575
-        check present export when not present:           OK (0.02s)
+        check present export when not present:           OK
         remove export when not present:                  OK
         store export:                                    OK (0.01s)
         check present export after store:                OK
         store export when already present:               OK
-        retrieve export:                                 OK
+        retrieve export:                                 OK (0.01s)
         store new content to export:                     OK
         check present export after store of new content: OK
-        retrieve export new content:                     OK
+        retrieve export new content:                     OK (0.02s)
         remove export:                                   OK (0.01s)
         check present export after remove:               OK
         retrieve export fails after removal:             OK
         remove export directory:                         OK
-        remove export directory that is already removed: OK (0.02s)
+        remove export directory that is already removed: OK (0.01s)
 
-All 700 tests passed (40.19s)
+All 700 tests passed (34.97s)
+Tests
+  QuickCheck
+    prop_quote_unquote_roundtrip:            OK (0.08s)
+      +++ OK, passed 1000 tests.
+    prop_encode_c_decode_c_roundtrip:        OK (0.02s)
+      +++ OK, passed 1000 tests.
+    prop_isomorphic_key_encode:              OK (0.02s)
+      +++ OK, passed 1000 tests.
+    prop_isomorphic_shellEscape:             OK (0.01s)
+      +++ OK, passed 1000 tests.
+    prop_isomorphic_shellEscape_multiword:   OK (0.50s)
+      +++ OK, passed 1000 tests.
+    prop_isomorphic_configEscape:            OK (0.01s)
+      +++ OK, passed 1000 tests.
+    prop_parse_show_Config:                  OK (0.03s)
+      +++ OK, passed 1000 tests.
+    prop_upFrom_basics:                      OK (0.02s)
+      +++ OK, passed 1000 tests.
+    prop_relPathDirToFileAbs_basics:         OK (0.01s)
+      +++ OK, passed 1000 tests.
+    prop_relPathDirToFileAbs_regressionTest: OK
+      +++ OK, passed 1 test.
+    prop_dirContains_regressionTest:         OK
+      +++ OK, passed 1 test.
+    prop_cost_sane:                          OK
+      +++ OK, passed 1 test.
+    prop_matcher_sane:                       OK
+      +++ OK, passed 1 test.
+    prop_HmacSha1WithCipher_sane:            OK
+      +++ OK, passed 1 test.
+    prop_VectorClock_sane:                   OK
+      +++ OK, passed 1 test.
+    prop_addMapLog_sane:                     OK
+      +++ OK, passed 1 test.
+    prop_verifiable_sane:                    OK (0.05s)
+      +++ OK, passed 1000 tests.
+    prop_segment_regressionTest:             OK
+      +++ OK, passed 1 test.
+    prop_read_write_transferinfo:            OK (0.03s)
+      +++ OK, passed 1000 tests.
+    prop_read_show_inodecache:               OK (0.01s)
+      +++ OK, passed 1000 tests.
+    prop_parse_build_presence_log:           OK (0.80s)
+      +++ OK, passed 1000 tests.
+    prop_parse_build_contentidentifier_log:  OK (0.59s)
+      +++ OK, passed 1000 tests.
+    prop_read_show_TrustLevel:               OK
+      +++ OK, passed 1 test.
+    prop_parse_build_TrustLevelLog:          OK
+      +++ OK, passed 1 test.
+    prop_schedule_roundtrips:                OK
+      +++ OK, passed 1000 tests.
+    prop_past_sane:                          OK
+      +++ OK, passed 1 test.
+    prop_duration_roundtrips:                OK
+      +++ OK, passed 1000 tests.
+    prop_metadata_sane:                      OK (0.37s)
+      +++ OK, passed 1000 tests.
+    prop_metadata_serialize:                 OK (0.41s)
+      +++ OK, passed 1000 tests.
+    prop_branchView_legal:                   OK (0.41s)
+      +++ OK, passed 1000 tests.
+    prop_viewPath_roundtrips:                OK (0.02s)
+      +++ OK, passed 1000 tests.
+    prop_view_roundtrips:                    OK (0.18s)
+      +++ OK, passed 1000 tests.
+    prop_viewedFile_rountrips:               OK (0.02s)
+      +++ OK, passed 1000 tests.
+    prop_standardGroups_parse:               OK
+      +++ OK, passed 1 test.
+    prop_balanced_stable:                    OK
+      +++ OK, passed 1 test.
+    sha1 stable:                             OK
+      +++ OK, passed 1 test.
+    sha2_224 stable:                         OK
+      +++ OK, passed 1 test.
+    sha2_256 stable:                         OK
+      +++ OK, passed 1 test.
+    sha2_384 stable:                         OK
+      +++ OK, passed 1 test.
+    sha2_512 stable:                         OK
+      +++ OK, passed 1 test.
+    skein256 stable:                         OK
+      +++ OK, passed 1 test.
+    skein512 stable:                         OK
+      +++ OK, passed 1 test.
+    sha3_224 stable:                         OK
+      +++ OK, passed 1 test.
+    sha3_256 stable:                         OK
+      +++ OK, passed 1 test.
+    sha3_384 stable:                         OK
+      +++ OK, passed 1 test.
+    sha3_512 stable:                         OK
+      +++ OK, passed 1 test.
+    blake2s_160 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2s_224 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2s_256 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2sp_224 stable:                     OK
+      +++ OK, passed 1 test.
+    blake2sp_256 stable:                     OK
+      +++ OK, passed 1 test.
+    blake2b_160 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2b_224 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2b_256 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2b_384 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2b_512 stable:                      OK
+      +++ OK, passed 1 test.
+    blake2bp_512 stable:                     OK
+      +++ OK, passed 1 test.
+    md5 stable:                              OK
+      +++ OK, passed 1 test.
+    HmacSha1 stable:                         OK
+      +++ OK, passed 1 test.
+    HmacSha224 stable:                       OK
+      +++ OK, passed 1 test.
+    HmacSha256 stable:                       OK
+      +++ OK, passed 1 test.
+    HmacSha384 stable:                       OK
+      +++ OK, passed 1 test.
+    HmacSha512 stable:                       OK
+      +++ OK, passed 1 test.
+
+All 63 tests passed (3.63s)
 Tests
   Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:                          OK (0.36s)
-      add:                           OK (0.57s)
-    gpg crypto:                      OK (8.63s)
+      init:                               OK (0.36s)
+      add:                                OK (0.47s)
+    uninit:                               OK (0.64s)
+    concurrent get of dup key regression: OK (1.20s)
+    fsck (basics):                        OK (1.23s)
+    drop (no remote):                     OK (0.80s)
+    add moved link:                       OK (0.69s)
+
+All 7 tests passed (5.39s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                             OK (0.34s)
+      add:                              OK (0.49s)
+    whereis:                            OK (0.91s)
+    adjusted branch subtree regression: OK (1.32s)
+    fsck (remote untrusted):            OK (0.90s)
+    get:                                OK (0.75s)
+    readonly remote:                    OK (1.46s)
+
+All 7 tests passed (6.16s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                           OK (0.33s)
+      add:                            OK (0.47s)
+    upgrade:                          OK (0.36s)
+    adjusted branch merge regression: OK (3.17s)
+    fsck (local untrusted):           OK (0.83s)
+    drop (untrusted remote):          OK (0.73s)
+    git-remote-annex exporttree:      OK (1.21s)
+
+All 7 tests passed (7.11s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                 OK (0.35s)
+      add:                  OK (0.47s)
+    hook remote:            OK (1.29s)
+    transition propagation: OK (4.04s)
+    fsck --from remote:     OK (0.37s)
+    get (ssh remote):       OK (0.81s)
+    ignore deleted files:   OK (0.52s)
+
+All 7 tests passed (7.84s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                       OK (0.36s)
+      add:                        OK (0.48s)
+    uninit (in git-annex branch): OK (0.49s)
+    union merge regression:       OK (4.61s)
+    fsck (bare):                  OK (0.19s)
+    drop (with remote):           OK (0.83s)
+    git-remote-annex:             OK (1.21s)
+
+All 7 tests passed (8.18s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                    OK (0.33s)
+      add:                     OK (0.46s)
+    directory remote:          OK (1.20s)
+    conflict resolution:       OK (3.64s)
+    conversion git to annexed: OK (0.64s)
+    move:                      OK (1.30s)
+    metadata:                  OK (1.03s)
+
+All 7 tests passed (8.60s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                                       OK (0.24s)
+      add:                                        OK (0.43s)
+    sop crypto:                                   OK
+    conflict resolution (uncommitted local file): OK (3.65s)
+    describe:                                     OK (0.44s)
+    lock --force:                                 OK (0.83s)
+    view:                                         OK (1.08s)
+
+All 7 tests passed (6.69s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                                OK (0.33s)
+      add:                                 OK (0.50s)
+    bup remote:                            OK (0.33s)
+    conflict resolution movein regression: OK (3.72s)
+    migrate:                               OK (1.32s)
+    move (numcopies):                      OK (1.25s)
+    export and import of subdir:           OK (2.92s)
+
+All 7 tests passed (10.38s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                                         OK (0.31s)
+      add:                                          OK (0.49s)
+    borg remote:                                    OK
+    conflict resolution (mixed directory and file): OK (6.81s)
+    migrate (via gitattributes):                    OK (1.42s)
+    copy:                                           OK (2.07s)
+    shared clone:                                   OK (0.66s)
+
+All 7 tests passed (11.77s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                                OK (0.31s)
+      add:                                 OK (0.46s)
+    rsync remote:                          OK (1.96s)
+    conflict resolution (adjusted branch): OK (3.59s)
+    conversion annexed to git:             OK (0.78s)
+    move (ssh remote):                     OK (1.15s)
+    export and import:                     OK (5.18s)
+
+All 7 tests passed (13.43s)
+Tests
+  Repo Tests v10 adjusted unlocked branch
+    Init Tests
+      init:                          OK (0.29s)
+      add:                           OK (0.48s)
+    gpg crypto:                      OK (6.96s)
     conflict resolution symlink bit: OK
-    unused:                          OK (4.75s)
-    lock:                            OK (2.30s)
-    log:                             OK (0.79s)
+    unused:                          OK (3.86s)
+    lock:                            OK (1.81s)
+    log:                             OK (0.66s)
 
-All 7 tests passed (17.41s)
+All 7 tests passed (14.06s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                               OK (0.28s)
-      add:                                OK (1.01s)
+      init:                               OK (0.14s)
+      add:                                OK (0.89s)
     uninit:                               OK (0.87s)
-    concurrent get of dup key regression: OK (1.92s)
-    fsck (basics):                        OK (2.22s)
-    drop (no remote):                     OK (1.28s)
-    add moved link:                       OK (0.95s)
+    concurrent get of dup key regression: OK (1.90s)
+    fsck (basics):                        OK (1.53s)
+    drop (no remote):                     OK (1.22s)
+    add moved link:                       OK (1.13s)
 
-All 7 tests passed (8.55s)
+All 7 tests passed (7.68s)
 Tests
   Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:              OK (0.51s)
-      add:               OK (0.89s)
-    repair:              OK (0.91s)
-    map:                 OK (0.92s)
-    sync:                OK (4.06s)
-    trust:               OK (1.89s)
-    unannex (with copy): OK (1.22s)
-    add extras:          OK (1.01s)
+      init:              OK (0.25s)
+      add:               OK (0.49s)
+    repair:              OK (0.88s)
+    map:                 OK (1.00s)
+    sync:                OK (3.26s)
+    trust:               OK (1.78s)
+    unannex (with copy): OK (1.08s)
+    add extras:          OK (0.88s)
 
-All 8 tests passed (11.41s)
+All 8 tests passed (9.62s)
 Tests
   Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:                                               OK (0.51s)
-      add:                                                OK (0.93s)
-    addurl:                                               OK (1.17s)
-    conflict resolution (mixed locked and unlocked file): OK (6.27s)
-    version:                                              OK (0.69s)
-    fix:                                                  OK (0.68s)
-    unannex (no copy):                                    OK (0.95s)
-    add dup:                                              OK (1.15s)
+      init:                                               OK (0.28s)
+      add:                                                OK (0.46s)
+    addurl:                                               OK (0.83s)
+    conflict resolution (mixed locked and unlocked file): OK (5.09s)
+    version:                                              OK (0.77s)
+    fix:                                                  OK (0.65s)
+    unannex (no copy):                                    OK (0.89s)
+    add dup:                                              OK (0.99s)
 
-All 8 tests passed (12.34s)
+All 8 tests passed (9.97s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                             OK (0.29s)
-      add:                              OK (1.12s)
-    whereis:                            OK (1.33s)
-    adjusted branch subtree regression: OK (1.93s)
-    fsck (remote untrusted):            OK (1.50s)
-    get:                                OK (1.22s)
-    readonly remote:                    OK (2.00s)
+      init:                             OK (0.24s)
+      add:                              OK (0.97s)
+    whereis:                            OK (0.90s)
+    adjusted branch subtree regression: OK (1.80s)
+    fsck (remote untrusted):            OK (1.39s)
+    get:                                OK (1.06s)
+    readonly remote:                    OK (1.93s)
 
-All 7 tests passed (9.39s)
+All 7 tests passed (8.30s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                       OK (0.29s)
-      add:                        OK (1.15s)
-    uninit (in git-annex branch): OK (0.64s)
-    union merge regression:       OK (5.28s)
-    fsck (bare):                  OK (0.44s)
-    drop (with remote):           OK (1.53s)
-    git-remote-annex:             OK (2.12s)
+      init:                       OK (0.28s)
+      add:                        OK (1.05s)
+    uninit (in git-annex branch): OK (0.58s)
+    union merge regression:       OK (4.62s)
+    fsck (bare):                  OK (0.35s)
+    drop (with remote):           OK (1.35s)
+    git-remote-annex:             OK (1.93s)
 
-All 7 tests passed (11.47s)
+All 7 tests passed (10.16s)
 Tests
-  Repo Tests v10 adjusted unlocked branch
+  Repo Tests v10 unlocked
     Init Tests
-      init:                                   OK (0.23s)
-      add:                                    OK (0.48s)
-    add subdirs:                              OK (1.08s)
-    conflict resolution (nonannexed symlink): OK (10.59s)
-    info:                                     OK (1.12s)
-    partial commit:                           OK (1.30s)
-    reinject:                                 OK (1.35s)
+      init:                           OK (0.28s)
+      add:                            OK (1.12s)
+    upgrade:                          OK (0.33s)
+    adjusted branch merge regression: OK (4.28s)
+    fsck (local untrusted):           OK (1.26s)
+    drop (untrusted remote):          OK (1.02s)
+    git-remote-annex exporttree:      OK (1.98s)
 
-All 7 tests passed (16.15s)
+All 7 tests passed (10.28s)
 Tests
-  Repo Tests v10 unlocked
+  Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:                           OK (0.28s)
-      add:                            OK (1.02s)
-    upgrade:                          OK (0.37s)
-    adjusted branch merge regression: OK (5.06s)
-    fsck (local untrusted):           OK (1.49s)
-    drop (untrusted remote):          OK (1.14s)
-    git-remote-annex exporttree:      OK (2.17s)
+      init:                                   OK (0.25s)
+      add:                                    OK (0.45s)
+    add subdirs:                              OK (0.59s)
+    conflict resolution (nonannexed symlink): OK (9.68s)
+    info:                                     OK (0.83s)
+    partial commit:                           OK (1.29s)
+    reinject:                                 OK (1.13s)
 
-All 7 tests passed (11.53s)
+All 7 tests passed (14.23s)
 Tests
   Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:                                OK (0.26s)
-      add:                                 OK (0.50s)
-    required_content:                      OK (1.19s)
-    conflict resolution (nonannexed file): OK (10.95s)
-    merge:                                 OK (1.08s)
-    edit (pre-commit):                     OK (1.51s)
-    import:                                OK (2.06s)
+      init:                                OK (0.23s)
+      add:                                 OK (0.48s)
+    required_content:                      OK (1.09s)
+    conflict resolution (nonannexed file): OK (9.43s)
+    merge:                                 OK (0.98s)
+    edit (pre-commit):                     OK (1.36s)
+    import:                                OK (1.87s)
 
-All 7 tests passed (17.55s)
+All 7 tests passed (15.45s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                 OK (0.25s)
-      add:                  OK (1.10s)
-    hook remote:            OK (2.24s)
-    transition propagation: OK (5.41s)
-    fsck --from remote:     OK (0.48s)
-    get (ssh remote):       OK (1.10s)
-    ignore deleted files:   OK (0.74s)
+      init:                 OK (0.27s)
+      add:                  OK (1.00s)
+    hook remote:            OK (2.11s)
+    transition propagation: OK (5.08s)
+    fsck --from remote:     OK (0.40s)
+    get (ssh remote):       OK (1.14s)
+    ignore deleted files:   OK (0.64s)
 
-All 7 tests passed (11.32s)
+All 7 tests passed (10.63s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                    OK (0.27s)
-      add:                     OK (1.08s)
-    directory remote:          OK (2.03s)
-    conflict resolution:       OK (3.99s)
-    conversion git to annexed: OK (0.90s)
-    move:                      OK (2.19s)
-    metadata:                  OK (1.37s)
+      init:                    OK (0.25s)
+      add:                     OK (0.98s)
+    directory remote:          OK (1.89s)
+    conflict resolution:       OK (3.80s)
+    conversion git to annexed: OK (0.75s)
+    move:                      OK (1.97s)
+    metadata:                  OK (1.19s)
 
-All 7 tests passed (11.83s)
+All 7 tests passed (10.84s)
 Tests
   Repo Tests v10 adjusted unlocked branch
     Init Tests
-      init:                             OK (0.27s)
-      add:                              OK (0.46s)
-    preferred content:                  OK (2.71s)
-    conflict resolution (removed file): OK (15.01s)
-    find:                               OK (2.09s)
-    edit (no pre-commit):               OK (1.46s)
-    magic:                              OK (2.16s)
+      init:                             OK (0.25s)
+      add:                              OK (0.45s)
+    preferred content:                  OK (2.16s)
+    conflict resolution (removed file): OK (13.44s)
+    find:                               OK (1.77s)
+    edit (no pre-commit):               OK (1.35s)
+    magic:                              OK (2.08s)
 
-All 7 tests passed (24.16s)
+All 7 tests passed (21.50s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                       OK (0.24s)
-      add:                                        OK (0.89s)
+      init:                                       OK (0.22s)
+      add:                                        OK (0.92s)
     sop crypto:                                   OK
-    conflict resolution (uncommitted local file): OK (4.02s)
-    describe:                                     OK (0.53s)
-    lock --force:                                 OK (1.05s)
-    view:                                         OK (0.82s)
+    conflict resolution (uncommitted local file): OK (3.49s)
+    describe:                                     OK (0.41s)
+    lock --force:                                 OK (1.00s)
+    view:                                         OK (0.78s)
 
-All 7 tests passed (7.55s)
+All 7 tests passed (6.83s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                OK (0.29s)
-      add:                                 OK (1.06s)
-    bup remote:                            OK (0.31s)
-    conflict resolution movein regression: OK (4.24s)
-    migrate:                               OK (2.47s)
-    move (numcopies):                      OK (2.33s)
-    export and import of subdir:           OK (3.29s)
+      init:                                         OK (0.22s)
+      add:                                          OK (0.96s)
+    borg remote:                                    OK
+    conflict resolution (mixed directory and file): OK (6.92s)
+    migrate (via gitattributes):                    OK (2.39s)
+    copy:                                           OK (2.14s)
+    shared clone:                                   OK (0.36s)
 
-All 7 tests passed (13.99s)
+All 7 tests passed (13.00s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                               OK (0.28s)
-      add:                                                OK (1.03s)
-    addurl:                                               OK (0.78s)
-    conflict resolution (mixed locked and unlocked file): OK (3.68s)
-    version:                                              OK (0.39s)
-    fix:                                                  OK (0.29s)
-    unannex (no copy):                                    OK (0.53s)
-    add dup:                                              OK (0.60s)
+      init:                                OK (0.27s)
+      add:                                 OK (0.91s)
+    bup remote:                            OK (0.26s)
+    conflict resolution movein regression: OK (3.99s)
+    migrate:                               OK (2.17s)
+    move (numcopies):                      OK (2.10s)
+    export and import of subdir:           OK (3.56s)
 
-All 8 tests passed (7.57s)
+All 7 tests passed (13.26s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                         OK (0.26s)
-      add:                                          OK (1.10s)
-    borg remote:                                    OK
-    conflict resolution (mixed directory and file): OK (7.92s)
-    migrate (via gitattributes):                    OK (2.47s)
-    copy:                                           OK (1.85s)
-    shared clone:                                   OK (0.35s)
+      init:                                   OK (0.22s)
+      add:                                    OK (0.93s)
+    add subdirs:                              OK (0.71s)
+    conflict resolution (nonannexed symlink): OK (5.69s)
+    info:                                     OK (0.72s)
+    partial commit:                           OK (1.09s)
+    reinject:                                 OK (1.31s)
 
-All 7 tests passed (13.96s)
+All 7 tests passed (10.67s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                   OK (0.27s)
-      add:                                    OK (1.05s)
-    add subdirs:                              OK (1.15s)
-    conflict resolution (nonannexed symlink): OK (5.65s)
-    info:                                     OK (0.67s)
-    partial commit:                           OK (0.98s)
-    reinject:                                 OK (1.22s)
+      init:                                               OK (0.23s)
+      add:                                                OK (0.96s)
+    addurl:                                               OK (0.92s)
+    conflict resolution (mixed locked and unlocked file): OK (3.97s)
+    version:                                              OK (0.45s)
+    fix:                                                  OK (0.34s)
+    unannex (no copy):                                    OK (0.59s)
+    add dup:                                              OK (0.76s)
 
-All 7 tests passed (10.99s)
+All 8 tests passed (8.22s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                OK (0.27s)
-      add:                                 OK (1.14s)
-    rsync remote:                          OK (3.06s)
-    conflict resolution (adjusted branch): OK (4.80s)
-    conversion annexed to git:             OK (1.28s)
-    move (ssh remote):                     OK (2.09s)
-    export and import:                     OK (4.52s)
+      init:                                OK (0.23s)
+      add:                                 OK (0.92s)
+    rsync remote:                          OK (2.56s)
+    conflict resolution (adjusted branch): OK (4.29s)
+    conversion annexed to git:             OK (1.13s)
+    move (ssh remote):                     OK (2.02s)
+    export and import:                     OK (5.05s)
 
-All 7 tests passed (17.16s)
+All 7 tests passed (16.21s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                                OK (0.33s)
-      add:                                 OK (1.07s)
-    required_content:                      OK (1.86s)
-    conflict resolution (nonannexed file): OK (5.85s)
-    merge:                                 OK (0.34s)
-    edit (pre-commit):                     OK (1.20s)
-    import:                                OK (1.84s)
+      init:                                OK (0.25s)
+      add:                                 OK (0.93s)
+    required_content:                      OK (1.60s)
+    conflict resolution (nonannexed file): OK (6.14s)
+    merge:                                 OK (0.44s)
+    edit (pre-commit):                     OK (1.25s)
+    import:                                OK (1.82s)
 
-All 7 tests passed (12.49s)
+All 7 tests passed (12.43s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:              OK (0.30s)
-      add:               OK (1.00s)
-    repair:              OK (0.53s)
-    map:                 OK (0.69s)
-    sync:                OK (3.07s)
-    trust:               OK (1.63s)
-    unannex (with copy): OK (0.83s)
-    add extras:          OK (1.00s)
+      init:              OK (0.25s)
+      add:               OK (1.03s)
+    repair:              OK (0.40s)
+    map:                 OK (0.62s)
+    sync:                OK (3.31s)
+    trust:               OK (1.68s)
+    unannex (with copy): OK (0.96s)
+    add extras:          OK (1.10s)
 
-All 8 tests passed (9.05s)
+All 8 tests passed (9.37s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                               OK (0.26s)
-      add:                                OK (0.94s)
-    uninit:                               OK (0.84s)
-    concurrent get of dup key regression: OK (1.34s)
-    fsck (basics):                        OK (2.07s)
-    drop (no remote):                     OK (1.16s)
-    add moved link:                       OK (0.97s)
+      init:                               OK (0.23s)
+      add:                                OK (0.85s)
+    uninit:                               OK (0.95s)
+    concurrent get of dup key regression: OK (1.45s)
+    fsck (basics):                        OK (2.35s)
+    drop (no remote):                     OK (1.20s)
+    add moved link:                       OK (0.71s)
 
-All 7 tests passed (7.58s)
+All 7 tests passed (7.75s)
 Tests
-  Repo Tests v10 unlocked
+  Repo Tests v10 locked
     Init Tests
-      init:                          OK (0.29s)
-      add:                           OK (1.01s)
-    gpg crypto:                      OK (12.17s)
-    conflict resolution symlink bit: OK
-    unused:                          OK (4.07s)
-    lock:                            OK (2.45s)
-    log:                             OK (0.45s)
+      init:                                       OK (0.20s)
+      add:                                        OK (0.80s)
+    sop crypto:                                   OK
+    conflict resolution (uncommitted local file): OK (3.05s)
+    describe:                                     OK (0.41s)
+    lock --force:                                 OK (0.83s)
+    view:                                         OK (0.97s)
 
-All 7 tests passed (20.45s)
+All 7 tests passed (6.25s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                       OK (0.27s)
-      add:                        OK (0.93s)
-    uninit (in git-annex branch): OK (0.53s)
-    union merge regression:       OK (5.02s)
-    fsck (bare):                  OK (0.37s)
-    drop (with remote):           OK (1.31s)
-    git-remote-annex:             OK (2.02s)
+      init:                       OK (0.25s)
+      add:                        OK (1.00s)
+    uninit (in git-annex branch): OK (0.67s)
+    union merge regression:       OK (5.21s)
+    fsck (bare):                  OK (0.32s)
+    drop (with remote):           OK (1.09s)
+    git-remote-annex:             OK (1.71s)
 
-All 7 tests passed (10.45s)
+All 7 tests passed (10.25s)
 Tests
   Repo Tests v10 unlocked
     Init Tests
-      init:                             OK (0.25s)
-      add:                              OK (1.00s)
-    preferred content:                  OK (4.43s)
-    conflict resolution (removed file): OK (8.73s)
-    find:                               OK (1.81s)
-    edit (no pre-commit):               OK (1.14s)
-    magic:                              OK (1.17s)
+      init:                             OK (0.23s)
+      add:                              OK (0.88s)
+    preferred content:                  OK (3.68s)
+    conflict resolution (removed file): OK (9.42s)
+    find:                               OK (1.50s)
+    edit (no pre-commit):               OK (1.03s)
+    magic:                              OK (1.20s)
 
-All 7 tests passed (18.53s)
+All 7 tests passed (17.95s)
 Tests
-  Repo Tests v10 locked
+  Repo Tests v10 unlocked
     Init Tests
-      init:                             OK (0.32s)
-      add:                              OK (0.84s)
-    whereis:                            OK (1.32s)
-    adjusted branch subtree regression: OK (2.09s)
-    fsck (remote untrusted):            OK (1.30s)
-    get:                                OK (1.12s)
-    readonly remote:                    OK (1.70s)
+      init:                          OK (0.25s)
+      add:                           OK (0.91s)
+    gpg crypto:                      OK (11.76s)
+    conflict resolution symlink bit: OK
+    unused:                          OK (3.54s)
+    lock:                            OK (1.96s)
+    log:                             OK (0.27s)
 
-All 7 tests passed (8.70s)
+All 7 tests passed (18.69s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                               OK (0.31s)
-      add:                                                OK (0.87s)
-    addurl:                                               OK (0.95s)
-    conflict resolution (mixed locked and unlocked file): OK (3.81s)
-    version:                                              OK (0.38s)
-    fix:                                                  OK (1.04s)
-    unannex (no copy):                                    OK (0.50s)
-    add dup:                                              OK (0.60s)
+      init:                             OK (0.30s)
+      add:                              OK (0.96s)
+    whereis:                            OK (1.52s)
+    adjusted branch subtree regression: OK (1.90s)
+    fsck (remote untrusted):            OK (1.15s)
+    get:                                OK (1.03s)
+    readonly remote:                    OK (1.27s)
 
-All 8 tests passed (8.47s)
+All 7 tests passed (8.14s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                           OK (0.32s)
-      add:                            OK (0.92s)
-    upgrade:                          OK (0.38s)
-    adjusted branch merge regression: OK (5.57s)
-    fsck (local untrusted):           OK (1.24s)
-    drop (untrusted remote):          OK (1.01s)
-    git-remote-annex exporttree:      OK (2.05s)
+      init:                           OK (0.30s)
+      add:                            OK (0.96s)
+    upgrade:                          OK (0.44s)
+    adjusted branch merge regression: OK (4.69s)
+    fsck (local untrusted):           OK (1.16s)
+    drop (untrusted remote):          OK (0.72s)
+    git-remote-annex exporttree:      OK (1.70s)
 
-All 7 tests passed (11.50s)
+All 7 tests passed (9.98s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                 OK (0.28s)
-      add:                  OK (0.86s)
-    hook remote:            OK (1.80s)
-    transition propagation: OK (5.70s)
-    fsck --from remote:     OK (0.44s)
-    get (ssh remote):       OK (1.30s)
-    ignore deleted files:   OK (0.64s)
+      init:                 OK (0.36s)
+      add:                  OK (0.89s)
+    hook remote:            OK (1.73s)
+    transition propagation: OK (4.67s)
+    fsck --from remote:     OK (0.43s)
+    get (ssh remote):       OK (1.31s)
+    ignore deleted files:   OK (0.67s)
 
-All 7 tests passed (11.02s)
+All 7 tests passed (10.07s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                    OK (0.25s)
-      add:                     OK (0.90s)
-    directory remote:          OK (1.81s)
-    conflict resolution:       OK (3.47s)
-    conversion git to annexed: OK (0.86s)
-    move:                      OK (2.04s)
-    metadata:                  OK (1.51s)
+      init:                    OK (0.26s)
+      add:                     OK (0.97s)
+    directory remote:          OK (1.67s)
+    conflict resolution:       OK (3.12s)
+    conversion git to annexed: OK (0.49s)
+    move:                      OK (1.52s)
+    metadata:                  OK (1.66s)
 
-All 7 tests passed (10.84s)
+All 7 tests passed (9.69s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                       OK (0.27s)
-      add:                                        OK (0.89s)
-    sop crypto:                                   OK
-    conflict resolution (uncommitted local file): OK (3.81s)
-    describe:                                     OK (0.60s)
-    lock --force:                                 OK (1.09s)
-    view:                                         OK (0.80s)
+      init:                                OK (0.33s)
+      add:                                 OK (0.92s)
+    rsync remote:                          OK (2.43s)
+    conflict resolution (adjusted branch): OK (4.33s)
+    conversion annexed to git:             OK (1.08s)
+    move (ssh remote):                     OK (2.00s)
+    export and import:                     OK (3.45s)
 
-All 7 tests passed (7.47s)
+All 7 tests passed (14.55s)
 Tests
   Repo Tests v10 locked
     Init Tests
       init:                                         OK (0.26s)
-      add:                                          OK (0.88s)
+      add:                                          OK (0.63s)
     borg remote:                                    OK
-    conflict resolution (mixed directory and file): OK (6.49s)
-    migrate (via gitattributes):                    OK (2.33s)
-    copy:                                           OK (1.67s)
-    shared clone:                                   OK (0.30s)
+    conflict resolution (mixed directory and file): OK (5.85s)
+    migrate (via gitattributes):                    OK (2.44s)
+    copy:                                           OK (1.40s)
+    shared clone:                                   OK (0.28s)
 
-All 7 tests passed (11.93s)
+All 7 tests passed (10.87s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                OK (0.26s)
-      add:                                 OK (0.89s)
-    bup remote:                            OK (0.31s)
-    conflict resolution movein regression: OK (4.37s)
-    migrate:                               OK (2.32s)
-    move (numcopies):                      OK (1.94s)
-    export and import of subdir:           OK (2.94s)
+      init:                                OK (0.30s)
+      add:                                 OK (0.73s)
+    bup remote:                            OK (0.23s)
+    conflict resolution movein regression: OK (3.98s)
+    migrate:                               OK (1.92s)
+    move (numcopies):                      OK (2.16s)
+    export and import of subdir:           OK (2.51s)
 
-All 7 tests passed (13.02s)
+All 7 tests passed (11.84s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                OK (0.25s)
-      add:                                 OK (0.84s)
-    rsync remote:                          OK (2.67s)
-    conflict resolution (adjusted branch): OK (5.07s)
-    conversion annexed to git:             OK (1.09s)
-    move (ssh remote):                     OK (1.98s)
-    export and import:                     OK (4.02s)
+      init:                                               OK (0.17s)
+      add:                                                OK (0.66s)
+    addurl:                                               OK (0.79s)
+    conflict resolution (mixed locked and unlocked file): OK (3.57s)
+    version:                                              OK (0.30s)
+    fix:                                                  OK (0.82s)
+    unannex (no copy):                                    OK (0.43s)
+    add dup:                                              OK (0.50s)
 
-All 7 tests passed (15.92s)
+All 8 tests passed (7.22s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                          OK (0.28s)
-      add:                           OK (0.96s)
-    gpg crypto:                      OK (11.63s)
-    conflict resolution symlink bit: OK (3.34s)
-    unused:                          OK (2.65s)
-    lock:                            OK (1.44s)
-    log:                             OK (0.15s)
+      init:                          OK (0.22s)
+      add:                           OK (0.76s)
+    gpg crypto:                      OK (10.06s)
+    conflict resolution symlink bit: OK (2.52s)
+    unused:                          OK (2.03s)
+    lock:                            OK (1.53s)
+    log:                             OK (0.21s)
 
-All 7 tests passed (20.44s)
+All 7 tests passed (17.32s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                   OK (0.32s)
-      add:                                    OK (0.90s)
-    add subdirs:                              OK (1.28s)
-    conflict resolution (nonannexed symlink): OK (4.96s)
-    info:                                     OK (0.62s)
-    partial commit:                           OK (0.80s)
-    reinject:                                 OK (0.76s)
+      init:                                   OK (0.19s)
+      add:                                    OK (0.65s)
+    add subdirs:                              OK (1.26s)
+    conflict resolution (nonannexed symlink): OK (4.67s)
+    info:                                     OK (0.47s)
+    partial commit:                           OK (0.71s)
+    reinject:                                 OK (0.59s)
 
-All 7 tests passed (9.64s)
+All 7 tests passed (8.55s)
 Tests
   Repo Tests v10 locked
     Init Tests
       init:              OK (0.30s)
-      add:               OK (0.89s)
-    repair:              OK (0.47s)
+      add:               OK (0.94s)
+    repair:              OK (0.56s)
     map:                 OK (0.60s)
-    sync:                OK (2.80s)
-    trust:               OK (1.39s)
-    unannex (with copy): OK (0.65s)
-    add extras:          OK (0.59s)
+    sync:                OK (2.40s)
+    trust:               OK (1.18s)
+    unannex (with copy): OK (0.50s)
+    add extras:          OK (0.44s)
 
-All 8 tests passed (7.70s)
+All 8 tests passed (6.95s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                                OK (0.27s)
-      add:                                 OK (0.95s)
-    required_content:                      OK (1.81s)
-    conflict resolution (nonannexed file): OK (5.48s)
-    merge:                                 OK (0.36s)
-    edit (pre-commit):                     OK (1.02s)
-    import:                                OK (1.43s)
+      init:                                OK (0.19s)
+      add:                                 OK (0.64s)
+    required_content:                      OK (1.45s)
+    conflict resolution (nonannexed file): OK (5.16s)
+    merge:                                 OK (0.26s)
+    edit (pre-commit):                     OK (0.87s)
+    import:                                OK (1.14s)
 
-All 7 tests passed (11.34s)
+All 7 tests passed (9.72s)
 Tests
   Repo Tests v10 locked
     Init Tests
-      init:                             OK (0.31s)
-      add:                              OK (0.77s)
-    preferred content:                  OK (3.92s)
-    conflict resolution (removed file): OK (7.87s)
-    find:                               OK (1.36s)
-    edit (no pre-commit):               OK (0.99s)
-    magic:                              OK (0.85s)
+      init:                             OK (0.28s)
+      add:                              OK (0.67s)
+    preferred content:                  OK (3.36s)
+    conflict resolution (removed file): OK (6.72s)
+    find:                               OK (0.96s)
+    edit (no pre-commit):               OK (0.75s)
+    magic:                              OK (0.75s)
 
-All 7 tests passed (16.08s)
+All 7 tests passed (13.50s)
 
-All tests succeeded. (Ran 50 test groups in 1m2s)
+All tests succeeded. (Ran 50 test groups in 54s)
 make[1]: Leaving directory '/build/reproducible-path/git-annex-10.20250721'
    create-stamp debian/debhelper-build-stamp
    dh_prep
@@ -5953,8 +5989,8 @@
 ./Setup build  -j1
 ./Build/MakeMans
 ghc --make Build/InstallDesktopFile -Wall -fno-warn-tabs
-install -d /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/man/man1
 /usr/bin/ikiwiki
+install -d /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/man/man1
 install -m 0644 man/*.1 /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/man/man1
 Preprocessing executable 'git-annex' for git-annex-10.20250721..
 Building executable 'git-annex' for git-annex-10.20250721..
@@ -6006,8 +6042,8 @@
 install -d /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/bin
 install -d /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/bash-completion/completions
 ./Build/InstallDesktopFile /usr/bin/git-annex || true
-install git-annex /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/bin
 install -m 0644 bash-completion.bash /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/bash-completion/completions/git-annex
+install git-annex /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/bin
 install -d /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/zsh/vendor-completions
 ./git-annex --zsh-completion-script git-annex 2>/dev/null \
 	> /build/reproducible-path/git-annex-10.20250721/debian/git-annex/usr/share/zsh/vendor-completions/_git-annex
@@ -6038,8 +6074,8 @@
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'git-annex' in '../git-annex_10.20250721-1_arm64.deb'.
 dpkg-deb: building package 'git-annex-dbgsym' in '../git-annex-dbgsym_10.20250721-1_arm64.deb'.
+dpkg-deb: building package 'git-annex' in '../git-annex_10.20250721-1_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../git-annex_10.20250721-1_arm64.buildinfo
  dpkg-genchanges --build=binary -O../git-annex_10.20250721-1_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -6048,12 +6084,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/1207369/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/1207369/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/3522710 and its subdirectories
-I: Current time: Sat Sep 26 08:30:29 -12 2026
-I: pbuilder-time-stamp: 1790454629
+I: removing directory /srv/workspace/pbuilder/1207369 and its subdirectories
+I: Current time: Mon Aug 25 04:21:37 +14 2025
+I: pbuilder-time-stamp: 1756045297