Mock Version: 1.4.21
Mock Version: 1.4.21
Mock Version: 1.4.21
ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target x86_64 --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f32-build-20078027-1422416/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;<mock-chroot>\\007"', 'PS1': '<mock-chroot> \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=<mockbuild.trace_decorator.getLog object at 0x7f3aa7d1add0>timeout=201600uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False)
Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target x86_64 --nodeps /builddir/build/SPECS/git-annex.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;<mock-chroot>\\007"', 'PS1': '<mock-chroot> \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1585612800
Wrote: /builddir/build/SRPMS/git-annex-8.20200330-1.fc32.src.rpm
Child return code was: 0
ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target x86_64 --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f32-build-20078027-1422416/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;<mock-chroot>\\007"', 'PS1': '<mock-chroot> \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=<mockbuild.trace_decorator.getLog object at 0x7f3aa7d1add0>timeout=201600uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False)
Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target x86_64 --nodeps /builddir/build/SPECS/git-annex.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;<mock-chroot>\\007"', 'PS1': '<mock-chroot> \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False
Building target platforms: x86_64
Building for target x86_64
setting SOURCE_DATE_EPOCH=1585612800
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.91nCKE
+ umask 022
+ cd /builddir/build/BUILD
+ cd /builddir/build/BUILD
+ rm -rf git-annex-8.20200330
+ /usr/bin/gzip -dc /builddir/build/SOURCES/git-annex-8.20200330.tar.gz
+ /usr/bin/tar -xof -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd git-annex-8.20200330
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ /usr/bin/cat /builddir/build/SOURCES/git-annex-default-flags.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch
+ cabal-tweak-drop-dep yesod-default
+ cabal-tweak-flag NetworkBSD False
+ cp /builddir/build/SOURCES/bash-completion.bash .
+ cp /builddir/build/SOURCES/index.mdwn doc/
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.gTnCXE
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ CFLAGS='-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection'
+ export CFLAGS
+ export 'LDFLAGS=-Wl,-z,relro -Wl,--as-needed  '
+ LDFLAGS='-Wl,-z,relro -Wl,--as-needed  '
+ '[' -f Setup.hs -o -f Setup.lhs ']'
+ '[' -x Setup ']'
+ ghc --make -no-user-package-db -dynamic Setup
[ 1 of 34] Compiling Utility.Applicative ( Utility/Applicative.hs, Utility/Applicative.o )
[ 2 of 34] Compiling Utility.Data     ( Utility/Data.hs, Utility/Data.o )
[ 3 of 34] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, Utility/DebugLocks.o )
[ 4 of 34] Compiling Utility.Exception ( Utility/Exception.hs, Utility/Exception.o )
[ 5 of 34] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, Utility/Env/Basic.o )
[ 6 of 34] Compiling Build.Mans       ( Build/Mans.hs, Build/Mans.o )
[ 7 of 34] Compiling Utility.FileSize ( Utility/FileSize.hs, Utility/FileSize.o )
[ 8 of 34] Compiling Utility.Misc     ( Utility/Misc.hs, Utility/Misc.o )
[ 9 of 34] Compiling Utility.Monad    ( Utility/Monad.hs, Utility/Monad.o )
[10 of 34] Compiling Build.Version    ( Build/Version.hs, Build/Version.o )
[11 of 34] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, Utility/PartialPrelude.o )
[12 of 34] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, Utility/Process/Shim.o )
[13 of 34] Compiling Utility.Process  ( Utility/Process.hs, Utility/Process.o )
[14 of 34] Compiling Utility.Network  ( Utility/Network.hs, Utility/Network.o )
[15 of 34] Compiling Utility.Split    ( Utility/Split.hs, Utility/Split.o )
[16 of 34] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, Utility/SafeCommand.o )
[17 of 34] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, Utility/FileSystemEncoding.o )
[18 of 34] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, Utility/SystemDirectory.o )
[19 of 34] Compiling Utility.Tmp      ( Utility/Tmp.hs, Utility/Tmp.o )
[20 of 34] Compiling Utility.UserInfo ( Utility/UserInfo.hs, Utility/UserInfo.o )
[21 of 34] Compiling Utility.Path     ( Utility/Path.hs, Utility/Path.o )
[22 of 34] Compiling Utility.Directory ( Utility/Directory.hs, Utility/Directory.o )
[23 of 34] Compiling Common           ( Common.hs, Common.o )
[24 of 34] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, Utility/DottedVersion.o )
[25 of 34] Compiling Git.Version      ( Git/Version.hs, Git/Version.o )
[26 of 34] Compiling Build.TestConfig ( Build/TestConfig.hs, Build/TestConfig.o )
[27 of 34] Compiling Build.Configure  ( Build/Configure.hs, Build/Configure.o )
[28 of 34] Compiling Utility.OSX      ( Utility/OSX.hs, Utility/OSX.o )
[29 of 34] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, Utility/FreeDesktop.o )
[30 of 34] Compiling Config.Files     ( Config/Files.hs, Config/Files.o )
[31 of 34] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, Assistant/Install/Menu.o )
[32 of 34] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, Assistant/Install/AutoStart.o )
[33 of 34] Compiling Build.DesktopFile ( Build/DesktopFile.hs, Build/DesktopFile.o )
[34 of 34] Compiling Main             ( Setup.hs, Setup.o )
Linking Setup ...
+ LANG=C.utf8
+ ./Setup --version
Cabal library version 2.4.0.1
+ '[' -x Setup ']'
+ LANG=C.utf8
++ echo ' -O2' -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
++ sed -e 's/ / -optc/g'
++ echo ' -Wl,-z,relro' -Wl,--as-needed
++ sed -e 's/ / -optl/g'
+ ./Setup configure --prefix=/usr --libdir=/usr/lib64 --docdir=/usr/share/licenses/git-annex '--libsubdir=$compiler/$pkgid' '--datasubdir=$pkgid' '--libexecsubdir=$pkgid' --ghc --dynlibdir=/usr/lib64 --global '--ghc-options= -optc-O2 -optc-g -optc-pipe -optc-Wall -optc-Werror=format-security -optc-Wp,-D_FORTIFY_SOURCE=2 -optc-Wp,-D_GLIBCXX_ASSERTIONS -optc-fexceptions -optc-fstack-protector-strong -optc-grecord-gcc-switches -optc-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -optc-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -optc-m64 -optc-mtune=generic -optc-fasynchronous-unwind-tables -optc-fstack-clash-protection -optc-fcf-protection  -optl-Wl,-z,relro -optl-Wl,--as-needed'
  checking UPGRADE_LOCATION... not available
  checking git... yes
  checking git version... 2.26.0
  checking cp -a... yes
  checking cp -p... yes
  checking cp --preserve=timestamps... yes
  checking cp --reflink=auto... yes
  checking xargs -0... yes
  checking rsync... yes
  checking curl... yes
  checking bup... no
  checking nice... yes
  checking ionice... yes
  checking nocache... no
  checking gpg... not available
  checking lsof... not available
  checking git-remote-gcrypt... not available
  checking ssh connection caching...fatal: not a git repository (or any of the parent directories): .git
 yes
Configuring git-annex-8.20200330...
+ '[' -x Setup ']'
+ LANG=C.utf8
+ ./Setup build
Preprocessing executable 'git-annex' for git-annex-8.20200330..
Building executable 'git-annex' for git-annex-8.20200330..
[  1 of 633] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o )
[  2 of 633] Compiling Assistant.Types.ThreadName ( Assistant/Types/ThreadName.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.o )
[  3 of 633] Compiling Assistant.Types.TransferSlots ( Assistant/Types/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.o )
[  4 of 633] Compiling BuildFlags       ( BuildFlags.hs, dist/build/git-annex/git-annex-tmp/BuildFlags.o )
[  5 of 633] Compiling BuildInfo        ( BuildInfo.hs, dist/build/git-annex/git-annex-tmp/BuildInfo.o )
[  6 of 633] Compiling Build.BundledPrograms ( Build/BundledPrograms.hs, dist/build/git-annex/git-annex-tmp/Build/BundledPrograms.o )
[  7 of 633] Compiling Config.Cost      ( Config/Cost.hs, dist/build/git-annex/git-annex-tmp/Config/Cost.o )
[  8 of 633] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o )
[  9 of 633] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o )
[ 10 of 633] Compiling Types.BranchState ( Types/BranchState.hs, dist/build/git-annex/git-annex-tmp/Types/BranchState.o )
[ 11 of 633] Compiling Types.Creds      ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o )
[ 12 of 633] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o )
[ 13 of 633] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o )
[ 14 of 633] Compiling Types.Mime       ( Types/Mime.hs, dist/build/git-annex/git-annex-tmp/Types/Mime.o )
[ 15 of 633] Compiling Types.ProposedAccepted ( Types/ProposedAccepted.hs, dist/build/git-annex/git-annex-tmp/Types/ProposedAccepted.o )
[ 16 of 633] Compiling Types.RemoteConfig ( Types/RemoteConfig.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteConfig.o )
[ 17 of 633] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o )
[ 18 of 633] Compiling Types.WorkerPool ( Types/WorkerPool.hs, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.o )
[ 19 of 633] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o )
[ 20 of 633] Compiling Utility.Attoparsec ( Utility/Attoparsec.hs, dist/build/git-annex/git-annex-tmp/Utility/Attoparsec.o )
[ 21 of 633] Compiling Utility.Bloom    ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o )
[ 22 of 633] Compiling Utility.Data     ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o )
[ 23 of 633] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o )
[ 24 of 633] Compiling Utility.Dot      ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o )
[ 25 of 633] Compiling Utility.Env      ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o )
[ 26 of 633] Compiling Utility.Env.Set  ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o )
[ 27 of 633] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o )
[ 28 of 633] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o )
[ 29 of 633] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o )
[ 30 of 633] Compiling Build.Mans       ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o )
[ 31 of 633] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o )
[ 32 of 633] Compiling Git.FileMode     ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o )
[ 33 of 633] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o )
[ 34 of 633] Compiling Utility.GitLFS   ( Utility/GitLFS.hs, dist/build/git-annex/git-annex-tmp/Utility/GitLFS.o )
[ 35 of 633] Compiling Utility.Glob     ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o )
[ 36 of 633] Compiling Utility.Hash     ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o )
[ 37 of 633] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o )
[ 38 of 633] Compiling Utility.HttpManagerRestricted ( Utility/HttpManagerRestricted.hs, dist/build/git-annex/git-annex-tmp/Utility/HttpManagerRestricted.o )
Utility/HttpManagerRestricted.hs:28:1: warning: [-Wdeprecations]
    Module ‘Network.BSD’ is deprecated:
      This platform dependent module is no longer supported.
   |
28 | import Network.BSD (getProtocolNumber)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Utility/HttpManagerRestricted.hs:179:34: warning: [-Wdeprecations]
    In the use of ‘getProtocolNumber’ (imported from Network.BSD):
    Deprecated: "This platform dependent module is no longer supported."
    |
179 |                         proto <- getProtocolNumber "tcp"
    |                                  ^^^^^^^^^^^^^^^^^
Utility/HttpManagerRestricted.hs:256:26: warning: [-Wdeprecations]
    In the use of ‘getProtocolNumber’ (imported from Network.BSD):
    Deprecated: "This platform dependent module is no longer supported."
    |
256 |                 proto <- getProtocolNumber "tcp"
    |                          ^^^^^^^^^^^^^^^^^
[ 39 of 633] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o )
[ 40 of 633] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o )
[ 41 of 633] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o )
[ 42 of 633] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o )
[ 43 of 633] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o )
[ 44 of 633] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o )
[ 45 of 633] Compiling Utility.MD5      ( Utility/MD5.hs, dist/build/git-annex/git-annex-tmp/Utility/MD5.o )
[ 46 of 633] Compiling Utility.Misc     ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o )
[ 47 of 633] Compiling Utility.Monad    ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o )
[ 48 of 633] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o )
[ 49 of 633] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o )
[ 50 of 633] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o )
[ 51 of 633] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o )
[ 52 of 633] Compiling Types.LockCache  ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o )
[ 53 of 633] Compiling Build.Version    ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o )
[ 54 of 633] Compiling Utility.Mounts   ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o )
[ 55 of 633] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o )
[ 56 of 633] Compiling Utility.PID      ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o )
[ 57 of 633] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o )
[ 58 of 633] Compiling Utility.Format   ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o )
[ 59 of 633] Compiling Utility.DBus     ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o )
[ 60 of 633] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o )
[ 61 of 633] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o )
[ 62 of 633] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o )
[ 63 of 633] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o )
[ 64 of 633] Compiling Utility.Process  ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o )
[ 65 of 633] Compiling Utility.Network  ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o )
[ 66 of 633] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o )
[ 67 of 633] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o )
[ 68 of 633] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o )
[ 69 of 633] Compiling Utility.Split    ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o )
[ 70 of 633] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o )
[ 71 of 633] Compiling Utility.Shell    ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o )
[ 72 of 633] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o )
[ 73 of 633] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o )
[ 74 of 633] Compiling Utility.Base64   ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o )
[ 75 of 633] Compiling Utility.Aeson    ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o )
[ 76 of 633] Compiling Types.Messages   ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o )
[ 77 of 633] Compiling Types.Key        ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o )
[ 78 of 633] Compiling Git.Types        ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o )
[ 79 of 633] Compiling Database.Handle  ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o )
[ 80 of 633] Compiling Database.Queue   ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o )
[ 81 of 633] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o )
[ 82 of 633] Compiling Utility.SshHost  ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o )
[ 83 of 633] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o )
[ 84 of 633] Compiling Utility.Tense    ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o )
[ 85 of 633] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o )
[ 86 of 633] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o )
[ 87 of 633] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o )
[ 88 of 633] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o )
[ 89 of 633] Compiling Annex.VectorClock ( Annex/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock.o )
[ 90 of 633] Compiling Utility.Tmp      ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o )
[ 91 of 633] Compiling Utility.Tmp.Dir  ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o )
[ 92 of 633] Compiling Utility.Touch    ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o )
[ 93 of 633] Compiling Utility.Tuple    ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o )
[ 94 of 633] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o )
[ 95 of 633] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o )
[ 96 of 633] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o )
[ 97 of 633] Compiling Utility.Path     ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o )
[ 98 of 633] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o )
[ 99 of 633] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o )
[100 of 633] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o )
Utility/LockFile/PidLock.hs:36:1: warning: [-Wdeprecations]
    Module ‘Network.BSD’ is deprecated:
      This platform dependent module is no longer supported.
   |
36 | import Network.BSD
   | ^^^^^^^^^^^^^^^^^^
Utility/LockFile/PidLock.hs:56:13: warning: [-Wdeprecations]
    In the use of ‘getHostName’ (imported from Network.BSD):
    Deprecated: "This platform dependent module is no longer supported."
   |
56 |         <*> getHostName
   |             ^^^^^^^^^^^
Utility/LockFile/PidLock.hs:139:31: warning: [-Wdeprecations]
    In the use of ‘getHostName’ (imported from Network.BSD):
    Deprecated: "This platform dependent module is no longer supported."
    |
139 |                         hn <- getHostName
    |                               ^^^^^^^^^^^
[101 of 633] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o )
[102 of 633] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o )
[103 of 633] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o )
[104 of 633] Compiling Common           ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o )
[105 of 633] Compiling Utility.Tor      ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o )
[106 of 633] Compiling Utility.TList    ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o )
[107 of 633] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o )
[108 of 633] Compiling Utility.Su       ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o )
[109 of 633] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o )
[110 of 633] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o )
[111 of 633] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o )
[112 of 633] Compiling Types.UUID       ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o )
[113 of 633] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o )
[114 of 633] Compiling Types.RemoteState ( Types/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteState.o )
[115 of 633] Compiling Types.NumCopies  ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o )
[116 of 633] Compiling Types.Group      ( Types/Group.hs, dist/build/git-annex/git-annex-tmp/Types/Group.o )
[117 of 633] Compiling Utility.Parallel ( Utility/Parallel.hs, dist/build/git-annex/git-annex-tmp/Utility/Parallel.o )
[118 of 633] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o )
[119 of 633] Compiling Utility.Metered  ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o )
[120 of 633] Compiling Utility.Url      ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o )
Utility/Url.hs:64:1: warning: [-Wdeprecations]
    Module ‘Network.BSD’ is deprecated:
      This platform dependent module is no longer supported.
   |
64 | import Network.BSD (getProtocolNumber)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Utility/Url.hs:645:26: warning: [-Wdeprecations]
    In the use of ‘getProtocolNumber’ (imported from Network.BSD):
    Deprecated: "This platform dependent module is no longer supported."
    |
645 |                 proto <- getProtocolNumber "tcp"
    |                          ^^^^^^^^^^^^^^^^^
[121 of 633] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o )
[122 of 633] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o )
[123 of 633] Compiling Utility.Rsync    ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o )
[124 of 633] Compiling Utility.Matcher  ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o )
[125 of 633] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o )
[126 of 633] Compiling Utility.Lsof     ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o )
[127 of 633] Compiling Utility.LogFile  ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o )
[128 of 633] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o )
[129 of 633] Compiling Types.KeySource  ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o )
[130 of 633] Compiling Types.Backend    ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o )
[131 of 633] Compiling Utility.Gpg      ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o )
[132 of 633] Compiling Types.Crypto     ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o )
[133 of 633] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o )
[134 of 633] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o )
[135 of 633] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o )
[136 of 633] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o )
[137 of 633] Compiling Utility.Daemon   ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o )
[138 of 633] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o )
[139 of 633] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o )
[140 of 633] Compiling Utility.Batch    ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o )
[141 of 633] Compiling Utility.Android  ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o )
[142 of 633] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o )
[143 of 633] Compiling Types.RefSpec    ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o )
[144 of 633] Compiling Types.MetaData   ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o )
[145 of 633] Compiling Annex.MetaData.StandardFields ( Annex/MetaData/StandardFields.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.o )
[146 of 633] Compiling Logs.Line        ( Logs/Line.hs, dist/build/git-annex/git-annex-tmp/Logs/Line.o )
[147 of 633] Compiling Logs.MapLog      ( Logs/MapLog.hs, dist/build/git-annex/git-annex-tmp/Logs/MapLog.o )
[148 of 633] Compiling Logs.UUIDBased   ( Logs/UUIDBased.hs, dist/build/git-annex/git-annex-tmp/Logs/UUIDBased.o )
[149 of 633] Compiling Key              ( Key.hs, dist/build/git-annex/git-annex-tmp/Key.o )
[150 of 633] Compiling Messages.JSON    ( Messages/JSON.hs, dist/build/git-annex/git-annex-tmp/Messages/JSON.o )
[151 of 633] Compiling Git.Version      ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o )
[152 of 633] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o )
[153 of 633] Compiling Git.Ssh          ( Git/Ssh.hs, dist/build/git-annex/git-annex-tmp/Git/Ssh.o )
[154 of 633] Compiling Git.Sha          ( Git/Sha.hs, dist/build/git-annex/git-annex-tmp/Git/Sha.o )
[155 of 633] Compiling Git.LockFile     ( Git/LockFile.hs, dist/build/git-annex/git-annex-tmp/Git/LockFile.o )
[156 of 633] Compiling Git.Filename     ( Git/Filename.hs, dist/build/git-annex/git-annex-tmp/Git/Filename.o )
[157 of 633] Compiling Git              ( Git.hs, dist/build/git-annex/git-annex-tmp/Git.o )
[158 of 633] Compiling Git.Url          ( Git/Url.hs, dist/build/git-annex/git-annex-tmp/Git/Url.o )
[159 of 633] Compiling Git.Remote       ( Git/Remote.hs, dist/build/git-annex/git-annex-tmp/Git/Remote.o )
[160 of 633] Compiling Git.Objects      ( Git/Objects.hs, dist/build/git-annex/git-annex-tmp/Git/Objects.o )
[161 of 633] Compiling Git.Index        ( Git/Index.hs, dist/build/git-annex/git-annex-tmp/Git/Index.o )
[162 of 633] Compiling Git.Hook         ( Git/Hook.hs, dist/build/git-annex/git-annex-tmp/Git/Hook.o )
[163 of 633] Compiling Git.FilePath     ( Git/FilePath.hs, dist/build/git-annex/git-annex-tmp/Git/FilePath.o )
[164 of 633] Compiling Types.Export     ( Types/Export.hs, dist/build/git-annex/git-annex-tmp/Types/Export.o )
[165 of 633] Compiling Types.Import     ( Types/Import.hs, dist/build/git-annex/git-annex-tmp/Types/Import.o )
[166 of 633] Compiling Database.Types   ( Database/Types.hs, dist/build/git-annex/git-annex-tmp/Database/Types.o )
[167 of 633] Compiling Git.DiffTreeItem ( Git/DiffTreeItem.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTreeItem.o )
[168 of 633] Compiling Database.Keys.SQL ( Database/Keys/SQL.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/SQL.o )
[169 of 633] Compiling Git.Env          ( Git/Env.hs, dist/build/git-annex/git-annex-tmp/Git/Env.o )
[170 of 633] Compiling Git.Command      ( Git/Command.hs, dist/build/git-annex/git-annex-tmp/Git/Command.o )
[171 of 633] Compiling Git.UpdateIndex  ( Git/UpdateIndex.hs, dist/build/git-annex/git-annex-tmp/Git/UpdateIndex.o )
[172 of 633] Compiling Git.Status       ( Git/Status.hs, dist/build/git-annex/git-annex-tmp/Git/Status.o )
[173 of 633] Compiling Git.Remote.Remove ( Git/Remote/Remove.hs, dist/build/git-annex/git-annex-tmp/Git/Remote/Remove.o )
[174 of 633] Compiling Git.RefLog       ( Git/RefLog.hs, dist/build/git-annex/git-annex-tmp/Git/RefLog.o )
[175 of 633] Compiling Git.Ref          ( Git/Ref.hs, dist/build/git-annex/git-annex-tmp/Git/Ref.o )
[176 of 633] Compiling Git.Queue        ( Git/Queue.hs, dist/build/git-annex/git-annex-tmp/Git/Queue.o )
[177 of 633] Compiling Git.LsTree       ( Git/LsTree.hs, dist/build/git-annex/git-annex-tmp/Git/LsTree.o )
[178 of 633] Compiling Git.Tree         ( Git/Tree.hs, dist/build/git-annex/git-annex-tmp/Git/Tree.o )
[179 of 633] Compiling Git.LsFiles      ( Git/LsFiles.hs, dist/build/git-annex/git-annex-tmp/Git/LsFiles.o )
[180 of 633] Compiling Git.History      ( Git/History.hs, dist/build/git-annex/git-annex-tmp/Git/History.o )
[181 of 633] Compiling Git.HashObject   ( Git/HashObject.hs, dist/build/git-annex/git-annex-tmp/Git/HashObject.o )
[182 of 633] Compiling Git.Fsck         ( Git/Fsck.hs, dist/build/git-annex/git-annex-tmp/Git/Fsck.o )
[183 of 633] Compiling Git.DiffTree     ( Git/DiffTree.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTree.o )
[184 of 633] Compiling Git.Credential   ( Git/Credential.hs, dist/build/git-annex/git-annex-tmp/Git/Credential.o )
[185 of 633] Compiling Git.Command.Batch ( Git/Command/Batch.hs, dist/build/git-annex/git-annex-tmp/Git/Command/Batch.o )
[186 of 633] Compiling Git.CheckIgnore  ( Git/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Git/CheckIgnore.o )
[187 of 633] Compiling Git.CheckAttr    ( Git/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Git/CheckAttr.o )
[188 of 633] Compiling Git.CatFile      ( Git/CatFile.hs, dist/build/git-annex/git-annex-tmp/Git/CatFile.o )
[189 of 633] Compiling Git.UnionMerge   ( Git/UnionMerge.hs, dist/build/git-annex/git-annex-tmp/Git/UnionMerge.o )
[190 of 633] Compiling Annex.AdjustedBranch.Name ( Annex/AdjustedBranch/Name.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch/Name.o )
[191 of 633] Compiling Config.DynamicConfig ( Config/DynamicConfig.hs, dist/build/git-annex/git-annex-tmp/Config/DynamicConfig.o )
[192 of 633] Compiling Annex.Magic      ( Annex/Magic.hs, dist/build/git-annex/git-annex-tmp/Annex/Magic.o )
[193 of 633] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o )
[194 of 633] Compiling Build.Configure  ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o )
[195 of 633] Compiling Utility.OSX      ( Utility/OSX.hs, dist/build/git-annex/git-annex-tmp/Utility/OSX.o )
[196 of 633] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, dist/build/git-annex/git-annex-tmp/Utility/FreeDesktop.o )
[197 of 633] Compiling Config.Files     ( Config/Files.hs, dist/build/git-annex/git-annex-tmp/Config/Files.o )
[198 of 633] Compiling Annex.Path       ( Annex/Path.hs, dist/build/git-annex/git-annex-tmp/Annex/Path.o )
[199 of 633] Compiling Annex.Multicast  ( Annex/Multicast.hs, dist/build/git-annex/git-annex-tmp/Annex/Multicast.o )
[200 of 633] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/Menu.o )
[201 of 633] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/AutoStart.o )
[202 of 633] Compiling Build.DesktopFile ( Build/DesktopFile.hs, dist/build/git-annex/git-annex-tmp/Build/DesktopFile.o )
[203 of 633] Compiling Git.Construct    ( Git/Construct.hs, dist/build/git-annex/git-annex-tmp/Git/Construct.o )
[204 of 633] Compiling Git.Config       ( Git/Config.hs, dist/build/git-annex/git-annex-tmp/Git/Config.o )
[205 of 633] Compiling Types.Distribution ( Types/Distribution.hs, dist/build/git-annex/git-annex-tmp/Types/Distribution.o )
[206 of 633] Compiling Types.Difference ( Types/Difference.hs, dist/build/git-annex/git-annex-tmp/Types/Difference.o )
[207 of 633] Compiling Git.GCrypt       ( Git/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Git/GCrypt.o )
[208 of 633] Compiling Git.CurrentRepo  ( Git/CurrentRepo.hs, dist/build/git-annex/git-annex-tmp/Git/CurrentRepo.o )
[209 of 633] Compiling Git.ConfigTypes  ( Git/ConfigTypes.hs, dist/build/git-annex/git-annex-tmp/Git/ConfigTypes.o )
[210 of 633] Compiling Git.Branch       ( Git/Branch.hs, dist/build/git-annex/git-annex-tmp/Git/Branch.o )
[211 of 633] Compiling Types.GitConfig  ( Types/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Types/GitConfig.o )
[212 of 633] Compiling Types.Remote     ( Types/Remote.hs, dist/build/git-annex/git-annex-tmp/Types/Remote.o )
[213 of 633] Compiling Annex.DirHashes  ( Annex/DirHashes.hs, dist/build/git-annex/git-annex-tmp/Annex/DirHashes.o )
[214 of 633] Compiling Git.Repair       ( Git/Repair.hs, dist/build/git-annex/git-annex-tmp/Git/Repair.o )
[215 of 633] Compiling Git.Merge        ( Git/Merge.hs, dist/build/git-annex/git-annex-tmp/Git/Merge.o )
[216 of 633] Compiling Git.AutoCorrect  ( Git/AutoCorrect.hs, dist/build/git-annex/git-annex-tmp/Git/AutoCorrect.o )
[217 of 633] Compiling Annex.Fixup      ( Annex/Fixup.hs, dist/build/git-annex/git-annex-tmp/Annex/Fixup.o )
[218 of 633] Compiling Annex.Locations  ( Annex/Locations.hs, dist/build/git-annex/git-annex-tmp/Annex/Locations.o )
[219 of 633] Compiling Annex            ( Annex.hs, dist/build/git-annex/git-annex-tmp/Annex.o )
[220 of 633] Compiling Types.DeferredParse ( Types/DeferredParse.hs, dist/build/git-annex/git-annex-tmp/Types/DeferredParse.o )
[221 of 633] Compiling Types            ( Types.hs, dist/build/git-annex/git-annex-tmp/Types.o )
[222 of 633] Compiling Types.Transfer   ( Types/Transfer.hs, dist/build/git-annex/git-annex-tmp/Types/Transfer.o )
[223 of 633] Compiling Types.ActionItem ( Types/ActionItem.hs, dist/build/git-annex/git-annex-tmp/Types/ActionItem.o )
[224 of 633] Compiling Types.Command    ( Types/Command.hs, dist/build/git-annex/git-annex-tmp/Types/Command.o )
[225 of 633] Compiling Types.Test       ( Types/Test.hs, dist/build/git-annex/git-annex-tmp/Types/Test.o )
[226 of 633] Compiling Types.Benchmark  ( Types/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Types/Benchmark.o )
[227 of 633] Compiling Remote.WebDAV.DavLocation ( Remote/WebDAV/DavLocation.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV/DavLocation.o )
[228 of 633] Compiling Remote.Rsync.RsyncUrl ( Remote/Rsync/RsyncUrl.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync/RsyncUrl.o )
[229 of 633] Compiling Assistant.Types.RepoProblem ( Assistant/Types/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RepoProblem.o )
[230 of 633] Compiling Annex.SpecialRemote.Config ( Annex/SpecialRemote/Config.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote/Config.o )
[231 of 633] Compiling Types.StandardGroups ( Types/StandardGroups.hs, dist/build/git-annex/git-annex-tmp/Types/StandardGroups.o )
[232 of 633] Compiling Messages.Concurrent ( Messages/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Messages/Concurrent.o )
[233 of 633] Compiling Messages.Internal ( Messages/Internal.hs, dist/build/git-annex/git-annex-tmp/Messages/Internal.o )
[234 of 633] Compiling Messages         ( Messages.hs, dist/build/git-annex/git-annex-tmp/Messages.o )
[235 of 633] Compiling Messages.Progress ( Messages/Progress.hs, dist/build/git-annex/git-annex-tmp/Messages/Progress.o )
[236 of 633] Compiling CmdLine.GlobalSetter ( CmdLine/GlobalSetter.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GlobalSetter.o )
[237 of 633] Compiling Annex.LockPool.PosixOrPid ( Annex/LockPool/PosixOrPid.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool/PosixOrPid.o )
[238 of 633] Compiling Annex.LockPool   ( Annex/LockPool.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool.o )
[239 of 633] Compiling Annex.Common     ( Annex/Common.hs, dist/build/git-annex/git-annex-tmp/Annex/Common.o )
[240 of 633] Compiling Upgrade.V4       ( Upgrade/V4.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V4.o )
[241 of 633] Compiling Upgrade.V3       ( Upgrade/V3.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V3.o )
[242 of 633] Compiling Types.View       ( Types/View.hs, dist/build/git-annex/git-annex-tmp/Types/View.o )
[243 of 633] Compiling Types.StoreRetrieve ( Types/StoreRetrieve.hs, dist/build/git-annex/git-annex-tmp/Types/StoreRetrieve.o )
[244 of 633] Compiling Remote.Helper.ReadOnly ( Remote/Helper/ReadOnly.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ReadOnly.o )
[245 of 633] Compiling Remote.Helper.Messages ( Remote/Helper/Messages.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Messages.o )
[246 of 633] Compiling Remote.Helper.Git ( Remote/Helper/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Git.o )
[247 of 633] Compiling Remote.External.Types ( Remote/External/Types.hs, dist/build/git-annex/git-annex-tmp/Remote/External/Types.o )
[248 of 633] Compiling Logs.Trust.Pure  ( Logs/Trust/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Pure.o )
[249 of 633] Compiling Logs.Transitions ( Logs/Transitions.hs, dist/build/git-annex/git-annex-tmp/Logs/Transitions.o )
[250 of 633] Compiling Logs.SingleValue.Pure ( Logs/SingleValue/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue/Pure.o )
[251 of 633] Compiling Logs.MetaData.Pure ( Logs/MetaData/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData/Pure.o )
[252 of 633] Compiling Logs.Remote.Pure ( Logs/Remote/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote/Pure.o )
[253 of 633] Compiling Logs.Presence.Pure ( Logs/Presence/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence/Pure.o )
[254 of 633] Compiling Logs.Difference.Pure ( Logs/Difference/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference/Pure.o )
[255 of 633] Compiling Logs.ContentIdentifier.Pure ( Logs/ContentIdentifier/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier/Pure.o )
[256 of 633] Compiling Logs.Chunk.Pure  ( Logs/Chunk/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk/Pure.o )
[257 of 633] Compiling Logs             ( Logs.hs, dist/build/git-annex/git-annex-tmp/Logs.o )
[258 of 633] Compiling Annex.Branch.Transitions ( Annex/Branch/Transitions.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch/Transitions.o )
[259 of 633] Compiling Database.Benchmark ( Database/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Database/Benchmark.o )
[260 of 633] Compiling Crypto           ( Crypto.hs, dist/build/git-annex/git-annex-tmp/Crypto.o )
[261 of 633] Compiling Remote.Helper.Encryptable ( Remote/Helper/Encryptable.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Encryptable.o )
[262 of 633] Compiling Config           ( Config.hs, dist/build/git-annex/git-annex-tmp/Config.o )
[263 of 633] Compiling Config.Smudge    ( Config/Smudge.hs, dist/build/git-annex/git-annex-tmp/Config/Smudge.o )
[264 of 633] Compiling CmdLine.Usage    ( CmdLine/Usage.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Usage.o )
[265 of 633] Compiling CmdLine.Option   ( CmdLine/Option.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Option.o )
[266 of 633] Compiling CmdLine.GitAnnexShell.Fields ( CmdLine/GitAnnexShell/Fields.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Fields.o )
[267 of 633] Compiling Backend.Utilities ( Backend/Utilities.hs, dist/build/git-annex/git-annex-tmp/Backend/Utilities.o )
[268 of 633] Compiling Backend.WORM     ( Backend/WORM.hs, dist/build/git-annex/git-annex-tmp/Backend/WORM.o )
[269 of 633] Compiling Backend.URL      ( Backend/URL.hs, dist/build/git-annex/git-annex-tmp/Backend/URL.o )
[270 of 633] Compiling Backend.Hash     ( Backend/Hash.hs, dist/build/git-annex/git-annex-tmp/Backend/Hash.o )
[271 of 633] Compiling Assistant.Types.TransferQueue ( Assistant/Types/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferQueue.o )
[272 of 633] Compiling Assistant.Types.ThreadedMonad ( Assistant/Types/ThreadedMonad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadedMonad.o )
[273 of 633] Compiling Assistant.Types.ScanRemotes ( Assistant/Types/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ScanRemotes.o )
[274 of 633] Compiling Assistant.Types.Pushes ( Assistant/Types/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Pushes.o )
[275 of 633] Compiling Assistant.Ssh    ( Assistant/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/Ssh.o )
[276 of 633] Compiling Assistant.Alert.Utility ( Assistant/Alert/Utility.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert/Utility.o )
[277 of 633] Compiling Annex.View.ViewedFile ( Annex/View/ViewedFile.hs, dist/build/git-annex/git-annex-tmp/Annex/View/ViewedFile.o )
[278 of 633] Compiling Annex.Version    ( Annex/Version.hs, dist/build/git-annex/git-annex-tmp/Annex/Version.o )
[279 of 633] Compiling Annex.VariantFile ( Annex/VariantFile.hs, dist/build/git-annex/git-annex-tmp/Annex/VariantFile.o )
[280 of 633] Compiling Annex.Url        ( Annex/Url.hs, dist/build/git-annex/git-annex-tmp/Annex/Url.o )
[281 of 633] Compiling Annex.UUID       ( Annex/UUID.hs, dist/build/git-annex/git-annex-tmp/Annex/UUID.o )
[282 of 633] Compiling Annex.Perms      ( Annex/Perms.hs, dist/build/git-annex/git-annex-tmp/Annex/Perms.o )
[283 of 633] Compiling Database.Init    ( Database/Init.hs, dist/build/git-annex/git-annex-tmp/Database/Init.o )
[284 of 633] Compiling Creds            ( Creds.hs, dist/build/git-annex/git-annex-tmp/Creds.o )
[285 of 633] Compiling Remote.Helper.AWS ( Remote/Helper/AWS.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/AWS.o )
[286 of 633] Compiling P2P.Address      ( P2P/Address.hs, dist/build/git-annex/git-annex-tmp/P2P/Address.o )
[287 of 633] Compiling P2P.Auth         ( P2P/Auth.hs, dist/build/git-annex/git-annex-tmp/P2P/Auth.o )
[288 of 633] Compiling Annex.Notification ( Annex/Notification.hs, dist/build/git-annex/git-annex-tmp/Annex/Notification.o )
[289 of 633] Compiling Annex.LockFile   ( Annex/LockFile.hs, dist/build/git-annex/git-annex-tmp/Annex/LockFile.o )
[290 of 633] Compiling Remote.Helper.Hooks ( Remote/Helper/Hooks.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Hooks.o )
[291 of 633] Compiling Database.Fsck    ( Database/Fsck.hs, dist/build/git-annex/git-annex-tmp/Database/Fsck.o )
[292 of 633] Compiling Annex.Tmp        ( Annex/Tmp.hs, dist/build/git-annex/git-annex-tmp/Annex/Tmp.o )
[293 of 633] Compiling Annex.ReplaceFile ( Annex/ReplaceFile.hs, dist/build/git-annex/git-annex-tmp/Annex/ReplaceFile.o )
[294 of 633] Compiling Logs.File        ( Logs/File.hs, dist/build/git-annex/git-annex-tmp/Logs/File.o )
[295 of 633] Compiling Logs.View        ( Logs/View.hs, dist/build/git-annex/git-annex-tmp/Logs/View.o )
[296 of 633] Compiling Logs.Unused      ( Logs/Unused.hs, dist/build/git-annex/git-annex-tmp/Logs/Unused.o )
[297 of 633] Compiling Logs.Transfer    ( Logs/Transfer.hs, dist/build/git-annex/git-annex-tmp/Logs/Transfer.o )
[298 of 633] Compiling Logs.Smudge      ( Logs/Smudge.hs, dist/build/git-annex/git-annex-tmp/Logs/Smudge.o )
[299 of 633] Compiling Logs.FsckResults ( Logs/FsckResults.hs, dist/build/git-annex/git-annex-tmp/Logs/FsckResults.o )
[300 of 633] Compiling Annex.Ssh        ( Annex/Ssh.hs, dist/build/git-annex/git-annex-tmp/Annex/Ssh.o )
[301 of 633] Compiling Annex.Queue      ( Annex/Queue.hs, dist/build/git-annex/git-annex-tmp/Annex/Queue.o )
[302 of 633] Compiling Annex.Journal    ( Annex/Journal.hs, dist/build/git-annex/git-annex-tmp/Annex/Journal.o )
[303 of 633] Compiling Annex.InodeSentinal ( Annex/InodeSentinal.hs, dist/build/git-annex/git-annex-tmp/Annex/InodeSentinal.o )
[304 of 633] Compiling Upgrade.V5.Direct ( Upgrade/V5/Direct.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5/Direct.o )
[305 of 633] Compiling Annex.Hook       ( Annex/Hook.hs, dist/build/git-annex/git-annex-tmp/Annex/Hook.o )
[306 of 633] Compiling Upgrade.V6       ( Upgrade/V6.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V6.o )
[307 of 633] Compiling Annex.HashObject ( Annex/HashObject.hs, dist/build/git-annex/git-annex-tmp/Annex/HashObject.o )
[308 of 633] Compiling Annex.Link       ( Annex/Link.hs, dist/build/git-annex/git-annex-tmp/Annex/Link.o )
[309 of 633] Compiling Annex.GitOverlay ( Annex/GitOverlay.hs, dist/build/git-annex/git-annex-tmp/Annex/GitOverlay.o )
[310 of 633] Compiling Annex.CurrentBranch ( Annex/CurrentBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/CurrentBranch.o )
[311 of 633] Compiling Annex.Content.LowLevel ( Annex/Content/LowLevel.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/LowLevel.o )
[312 of 633] Compiling Annex.Content.PointerFile ( Annex/Content/PointerFile.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/PointerFile.o )
[313 of 633] Compiling Annex.ChangedRefs ( Annex/ChangedRefs.hs, dist/build/git-annex/git-annex-tmp/Annex/ChangedRefs.o )
[314 of 633] Compiling RemoteDaemon.Types ( RemoteDaemon/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Types.o )
[315 of 633] Compiling Assistant.Types.RemoteControl ( Assistant/Types/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RemoteControl.o )
[316 of 633] Compiling RemoteDaemon.Transport.Ssh.Types ( RemoteDaemon/Transport/Ssh/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh/Types.o )
[317 of 633] Compiling P2P.Protocol     ( P2P/Protocol.hs, dist/build/git-annex/git-annex-tmp/P2P/Protocol.o )
[318 of 633] Compiling P2P.IO           ( P2P/IO.hs, dist/build/git-annex/git-annex-tmp/P2P/IO.o )
[319 of 633] Compiling CmdLine.GitRemoteTorAnnex ( CmdLine/GitRemoteTorAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitRemoteTorAnnex.o )
[320 of 633] Compiling Annex.CheckIgnore ( Annex/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckIgnore.o )
[321 of 633] Compiling Annex.CheckAttr  ( Annex/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckAttr.o )
[322 of 633] Compiling Backend          ( Backend.hs, dist/build/git-annex/git-annex-tmp/Backend.o )
[323 of 633] Compiling Annex.CatFile    ( Annex/CatFile.hs, dist/build/git-annex/git-annex-tmp/Annex/CatFile.o )
[324 of 633] Compiling RemoteDaemon.Common ( RemoteDaemon/Common.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Common.o )
[325 of 633] Compiling Database.Keys    ( Database/Keys.hs, dist/build/git-annex/git-annex-tmp/Database/Keys.o )
[326 of 633] Compiling Upgrade.V7       ( Upgrade/V7.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V7.o )
[327 of 633] Compiling Annex.RemoteTrackingBranch ( Annex/RemoteTrackingBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/RemoteTrackingBranch.o )
[328 of 633] Compiling Annex.Export     ( Annex/Export.hs, dist/build/git-annex/git-annex-tmp/Annex/Export.o )
[329 of 633] Compiling Annex.Concurrent ( Annex/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Annex/Concurrent.o )
[330 of 633] Compiling Annex.Transfer   ( Annex/Transfer.hs, dist/build/git-annex/git-annex-tmp/Annex/Transfer.o )
[331 of 633] Compiling Annex.BranchState ( Annex/BranchState.hs, dist/build/git-annex/git-annex-tmp/Annex/BranchState.o )
[332 of 633] Compiling Annex.Branch     ( Annex/Branch.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch.o )
[333 of 633] Compiling Logs.UUID        ( Logs/UUID.hs, dist/build/git-annex/git-annex-tmp/Logs/UUID.o )
[334 of 633] Compiling Logs.Trust.Basic ( Logs/Trust/Basic.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Basic.o )
[335 of 633] Compiling Logs.SingleValue ( Logs/SingleValue.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue.o )
[336 of 633] Compiling Logs.NumCopies   ( Logs/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Logs/NumCopies.o )
[337 of 633] Compiling Logs.Schedule    ( Logs/Schedule.hs, dist/build/git-annex/git-annex-tmp/Logs/Schedule.o )
[338 of 633] Compiling Logs.RemoteState ( Logs/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Logs/RemoteState.o )
[339 of 633] Compiling Logs.Remote      ( Logs/Remote.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote.o )
[340 of 633] Compiling Logs.Presence    ( Logs/Presence.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence.o )
[341 of 633] Compiling Logs.PreferredContent.Raw ( Logs/PreferredContent/Raw.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent/Raw.o )
[342 of 633] Compiling Logs.Multicast   ( Logs/Multicast.hs, dist/build/git-annex/git-annex-tmp/Logs/Multicast.o )
[343 of 633] Compiling Logs.MetaData    ( Logs/MetaData.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData.o )
[344 of 633] Compiling Annex.MetaData   ( Annex/MetaData.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData.o )
[345 of 633] Compiling Logs.Location    ( Logs/Location.hs, dist/build/git-annex/git-annex-tmp/Logs/Location.o )
[346 of 633] Compiling Logs.Web         ( Logs/Web.hs, dist/build/git-annex/git-annex-tmp/Logs/Web.o )
[347 of 633] Compiling Logs.Group       ( Logs/Group.hs, dist/build/git-annex/git-annex-tmp/Logs/Group.o )
[348 of 633] Compiling Logs.Export      ( Logs/Export.hs, dist/build/git-annex/git-annex-tmp/Logs/Export.o )
[349 of 633] Compiling Database.Export  ( Database/Export.hs, dist/build/git-annex/git-annex-tmp/Database/Export.o )
[350 of 633] Compiling Logs.Difference  ( Logs/Difference.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference.o )
[351 of 633] Compiling Annex.Difference ( Annex/Difference.hs, dist/build/git-annex/git-annex-tmp/Annex/Difference.o )
[352 of 633] Compiling Logs.ContentIdentifier ( Logs/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier.o )
[353 of 633] Compiling Logs.Config      ( Logs/Config.hs, dist/build/git-annex/git-annex-tmp/Logs/Config.o )
[354 of 633] Compiling Config.GitConfig ( Config/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Config/GitConfig.o )
[355 of 633] Compiling Logs.Chunk       ( Logs/Chunk.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk.o )
[356 of 633] Compiling Remote.Helper.Chunked ( Remote/Helper/Chunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked.o )
[357 of 633] Compiling Remote.Helper.Chunked.Legacy ( Remote/Helper/Chunked/Legacy.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked/Legacy.o )
[358 of 633] Compiling Logs.Activity    ( Logs/Activity.hs, dist/build/git-annex/git-annex-tmp/Logs/Activity.o )
[359 of 633] Compiling Database.ContentIdentifier ( Database/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Database/ContentIdentifier.o )
[360 of 633] Compiling Remote.Helper.ExportImport ( Remote/Helper/ExportImport.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ExportImport.o )
[361 of 633] Compiling Remote.BitTorrent ( Remote/BitTorrent.hs, dist/build/git-annex/git-annex-tmp/Remote/BitTorrent.o )
[362 of 633] Compiling Annex.Content    ( Annex/Content.hs, dist/build/git-annex/git-annex-tmp/Annex/Content.o )
[363 of 633] Compiling Upgrade.V2       ( Upgrade/V2.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V2.o )
[364 of 633] Compiling Upgrade.V1       ( Upgrade/V1.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V1.o )
[365 of 633] Compiling Upgrade.V0       ( Upgrade/V0.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V0.o )
[366 of 633] Compiling Remote.Helper.Special ( Remote/Helper/Special.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Special.o )
[367 of 633] Compiling Remote.Tahoe     ( Remote/Tahoe.hs, dist/build/git-annex/git-annex-tmp/Remote/Tahoe.o )
[368 of 633] Compiling Remote.Rsync     ( Remote/Rsync.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync.o )
[369 of 633] Compiling Remote.Hook      ( Remote/Hook.hs, dist/build/git-annex/git-annex-tmp/Remote/Hook.o )
[370 of 633] Compiling Remote.Helper.Http ( Remote/Helper/Http.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Http.o )
[371 of 633] Compiling Remote.WebDAV    ( Remote/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV.o )
[372 of 633] Compiling Remote.S3        ( Remote/S3.hs, dist/build/git-annex/git-annex-tmp/Remote/S3.o )
[373 of 633] Compiling Remote.Glacier   ( Remote/Glacier.hs, dist/build/git-annex/git-annex-tmp/Remote/Glacier.o )
[374 of 633] Compiling Remote.Directory.LegacyChunked ( Remote/Directory/LegacyChunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory/LegacyChunked.o )
[375 of 633] Compiling Remote.Ddar      ( Remote/Ddar.hs, dist/build/git-annex/git-annex-tmp/Remote/Ddar.o )
[376 of 633] Compiling Remote.Adb       ( Remote/Adb.hs, dist/build/git-annex/git-annex-tmp/Remote/Adb.o )
[377 of 633] Compiling Remote.Helper.P2P ( Remote/Helper/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/P2P.o )
[378 of 633] Compiling Remote.External  ( Remote/External.hs, dist/build/git-annex/git-annex-tmp/Remote/External.o )
[379 of 633] Compiling Remote.Directory ( Remote/Directory.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory.o )
[380 of 633] Compiling P2P.Annex        ( P2P/Annex.hs, dist/build/git-annex/git-annex-tmp/P2P/Annex.o )
[381 of 633] Compiling RemoteDaemon.Transport.Tor ( RemoteDaemon/Transport/Tor.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Tor.o )
[382 of 633] Compiling Remote.P2P       ( Remote/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/P2P.o )
[383 of 633] Compiling Remote.Helper.Ssh ( Remote/Helper/Ssh.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Ssh.o )
[384 of 633] Compiling RemoteDaemon.Transport.Ssh ( RemoteDaemon/Transport/Ssh.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh.o )
[385 of 633] Compiling Remote.GCrypt    ( Remote/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Remote/GCrypt.o )
[386 of 633] Compiling RemoteDaemon.Transport.GCrypt ( RemoteDaemon/Transport/GCrypt.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/GCrypt.o )
[387 of 633] Compiling RemoteDaemon.Transport ( RemoteDaemon/Transport.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport.o )
[388 of 633] Compiling RemoteDaemon.Core ( RemoteDaemon/Core.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Core.o )
[389 of 633] Compiling Remote.GitLFS    ( Remote/GitLFS.hs, dist/build/git-annex/git-annex-tmp/Remote/GitLFS.o )
[390 of 633] Compiling Remote.Bup       ( Remote/Bup.hs, dist/build/git-annex/git-annex-tmp/Remote/Bup.o )
[391 of 633] Compiling Annex.YoutubeDl  ( Annex/YoutubeDl.hs, dist/build/git-annex/git-annex-tmp/Annex/YoutubeDl.o )
[392 of 633] Compiling Remote.Web       ( Remote/Web.hs, dist/build/git-annex/git-annex-tmp/Remote/Web.o )
[393 of 633] Compiling Annex.WorkTree   ( Annex/WorkTree.hs, dist/build/git-annex/git-annex-tmp/Annex/WorkTree.o )
[394 of 633] Compiling Annex.AutoMerge  ( Annex/AutoMerge.hs, dist/build/git-annex/git-annex-tmp/Annex/AutoMerge.o )
[395 of 633] Compiling Annex.BloomFilter ( Annex/BloomFilter.hs, dist/build/git-annex/git-annex-tmp/Annex/BloomFilter.o )
[396 of 633] Compiling Annex.AdjustedBranch ( Annex/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch.o )
[397 of 633] Compiling Upgrade.V5       ( Upgrade/V5.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5.o )
[398 of 633] Compiling Upgrade          ( Upgrade.hs, dist/build/git-annex/git-annex-tmp/Upgrade.o )
[399 of 633] Compiling Annex.UpdateInstead ( Annex/UpdateInstead.hs, dist/build/git-annex/git-annex-tmp/Annex/UpdateInstead.o )
[400 of 633] Compiling Annex.Action     ( Annex/Action.hs, dist/build/git-annex/git-annex-tmp/Annex/Action.o )
[401 of 633] Compiling Assistant.Gpg    ( Assistant/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/Gpg.o )
[402 of 633] Compiling Annex.Environment ( Annex/Environment.hs, dist/build/git-annex/git-annex-tmp/Annex/Environment.o )
[403 of 633] Compiling Annex.Init       ( Annex/Init.hs, dist/build/git-annex/git-annex-tmp/Annex/Init.o )
[404 of 633] Compiling Remote.Git       ( Remote/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Git.o )
[405 of 633] Compiling Remote.List      ( Remote/List.hs, dist/build/git-annex/git-annex-tmp/Remote/List.o )
[406 of 633] Compiling Logs.Trust       ( Logs/Trust.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust.o )
[407 of 633] Compiling Remote           ( Remote.hs, dist/build/git-annex/git-annex-tmp/Remote.o )
[408 of 633] Compiling Assistant.WebApp.RepoId ( Assistant/WebApp/RepoId.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoId.o )
[409 of 633] Compiling Annex.TaggedPush ( Annex/TaggedPush.hs, dist/build/git-annex/git-annex-tmp/Annex/TaggedPush.o )
[410 of 633] Compiling Annex.NumCopies  ( Annex/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Annex/NumCopies.o )
[411 of 633] Compiling Limit            ( Limit.hs, dist/build/git-annex/git-annex-tmp/Limit.o )
[412 of 633] Compiling Annex.FileMatcher ( Annex/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Annex/FileMatcher.o )
[413 of 633] Compiling Logs.PreferredContent ( Logs/PreferredContent.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent.o )
[414 of 633] Compiling Annex.Wanted     ( Annex/Wanted.hs, dist/build/git-annex/git-annex-tmp/Annex/Wanted.o )
[415 of 633] Compiling Limit.Wanted     ( Limit/Wanted.hs, dist/build/git-annex/git-annex-tmp/Limit/Wanted.o )
[416 of 633] Compiling CmdLine.GitAnnex.Options ( CmdLine/GitAnnex/Options.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex/Options.o )
[417 of 633] Compiling Annex.Ingest     ( Annex/Ingest.hs, dist/build/git-annex/git-annex-tmp/Annex/Ingest.o )
[418 of 633] Compiling Assistant.Types.Changes ( Assistant/Types/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Changes.o )
[419 of 633] Compiling CmdLine.Seek     ( CmdLine/Seek.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Seek.o )
[420 of 633] Compiling CmdLine.Action   ( CmdLine/Action.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Action.o )
[421 of 633] Compiling CmdLine.Batch    ( CmdLine/Batch.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Batch.o )
[422 of 633] Compiling Annex.View       ( Annex/View.hs, dist/build/git-annex/git-annex-tmp/Annex/View.o )
[423 of 633] Compiling Annex.SpecialRemote ( Annex/SpecialRemote.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote.o )
[424 of 633] Compiling Command          ( Command.hs, dist/build/git-annex/git-annex-tmp/Command.o )
[425 of 633] Compiling Command.Whereis  ( Command/Whereis.hs, dist/build/git-annex/git-annex-tmp/Command/Whereis.o )
[426 of 633] Compiling Command.Wanted   ( Command/Wanted.hs, dist/build/git-annex/git-annex-tmp/Command/Wanted.o )
[427 of 633] Compiling Command.View     ( Command/View.hs, dist/build/git-annex/git-annex-tmp/Command/View.o )
[428 of 633] Compiling Command.Vicfg    ( Command/Vicfg.hs, dist/build/git-annex/git-annex-tmp/Command/Vicfg.o )
[429 of 633] Compiling Command.Version  ( Command/Version.hs, dist/build/git-annex/git-annex-tmp/Command/Version.o )
[430 of 633] Compiling Command.VPop     ( Command/VPop.hs, dist/build/git-annex/git-annex-tmp/Command/VPop.o )
[431 of 633] Compiling Command.VFilter  ( Command/VFilter.hs, dist/build/git-annex/git-annex-tmp/Command/VFilter.o )
[432 of 633] Compiling Command.VCycle   ( Command/VCycle.hs, dist/build/git-annex/git-annex-tmp/Command/VCycle.o )
[433 of 633] Compiling Command.VAdd     ( Command/VAdd.hs, dist/build/git-annex/git-annex-tmp/Command/VAdd.o )
[434 of 633] Compiling Command.Upgrade  ( Command/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Command/Upgrade.o )
[435 of 633] Compiling Command.Unused   ( Command/Unused.hs, dist/build/git-annex/git-annex-tmp/Command/Unused.o )
[436 of 633] Compiling Command.Unlock   ( Command/Unlock.hs, dist/build/git-annex/git-annex-tmp/Command/Unlock.o )
[437 of 633] Compiling Command.Ungroup  ( Command/Ungroup.hs, dist/build/git-annex/git-annex-tmp/Command/Ungroup.o )
[438 of 633] Compiling Command.Unannex  ( Command/Unannex.hs, dist/build/git-annex/git-annex-tmp/Command/Unannex.o )
[439 of 633] Compiling Command.Uninit   ( Command/Uninit.hs, dist/build/git-annex/git-annex-tmp/Command/Uninit.o )
[440 of 633] Compiling Test.Framework   ( Test/Framework.hs, dist/build/git-annex/git-annex-tmp/Test/Framework.o )
[441 of 633] Compiling Command.Trust    ( Command/Trust.hs, dist/build/git-annex/git-annex-tmp/Command/Trust.o )
[442 of 633] Compiling Command.Untrust  ( Command/Untrust.hs, dist/build/git-annex/git-annex-tmp/Command/Untrust.o )
[443 of 633] Compiling Command.TransferKeys ( Command/TransferKeys.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKeys.o )
[444 of 633] Compiling Command.TransferKey ( Command/TransferKey.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKey.o )
[445 of 633] Compiling Command.TransferInfo ( Command/TransferInfo.hs, dist/build/git-annex/git-annex-tmp/Command/TransferInfo.o )
[446 of 633] Compiling Command.TestRemote ( Command/TestRemote.hs, dist/build/git-annex/git-annex-tmp/Command/TestRemote.o )
[447 of 633] Compiling Command.Test     ( Command/Test.hs, dist/build/git-annex/git-annex-tmp/Command/Test.o )
[448 of 633] Compiling Command.Status   ( Command/Status.hs, dist/build/git-annex/git-annex-tmp/Command/Status.o )
[449 of 633] Compiling Command.Smudge   ( Command/Smudge.hs, dist/build/git-annex/git-annex-tmp/Command/Smudge.o )
[450 of 633] Compiling Command.SetPresentKey ( Command/SetPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetPresentKey.o )
[451 of 633] Compiling Command.SetKey   ( Command/SetKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetKey.o )
[452 of 633] Compiling Command.SendKey  ( Command/SendKey.hs, dist/build/git-annex/git-annex-tmp/Command/SendKey.o )
[453 of 633] Compiling Command.Semitrust ( Command/Semitrust.hs, dist/build/git-annex/git-annex-tmp/Command/Semitrust.o )
[454 of 633] Compiling Command.Schedule ( Command/Schedule.hs, dist/build/git-annex/git-annex-tmp/Command/Schedule.o )
[455 of 633] Compiling Command.RmUrl    ( Command/RmUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RmUrl.o )
[456 of 633] Compiling Command.ResolveMerge ( Command/ResolveMerge.hs, dist/build/git-annex/git-annex-tmp/Command/ResolveMerge.o )
[457 of 633] Compiling Command.Required ( Command/Required.hs, dist/build/git-annex/git-annex-tmp/Command/Required.o )
[458 of 633] Compiling Command.Repair   ( Command/Repair.hs, dist/build/git-annex/git-annex-tmp/Command/Repair.o )
[459 of 633] Compiling Command.RenameRemote ( Command/RenameRemote.hs, dist/build/git-annex/git-annex-tmp/Command/RenameRemote.o )
[460 of 633] Compiling Command.RemoteDaemon ( Command/RemoteDaemon.hs, dist/build/git-annex/git-annex-tmp/Command/RemoteDaemon.o )
[461 of 633] Compiling Command.Reinject ( Command/Reinject.hs, dist/build/git-annex/git-annex-tmp/Command/Reinject.o )
[462 of 633] Compiling Command.Reinit   ( Command/Reinit.hs, dist/build/git-annex/git-annex-tmp/Command/Reinit.o )
[463 of 633] Compiling Command.RecvKey  ( Command/RecvKey.hs, dist/build/git-annex/git-annex-tmp/Command/RecvKey.o )
[464 of 633] Compiling Command.ReadPresentKey ( Command/ReadPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReadPresentKey.o )
[465 of 633] Compiling Command.ReKey    ( Command/ReKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReKey.o )
[466 of 633] Compiling Command.Proxy    ( Command/Proxy.hs, dist/build/git-annex/git-annex-tmp/Command/Proxy.o )
[467 of 633] Compiling Command.P2P      ( Command/P2P.hs, dist/build/git-annex/git-annex-tmp/Command/P2P.o )
[468 of 633] Compiling Command.NumCopies ( Command/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Command/NumCopies.o )
[469 of 633] Compiling Command.NotifyChanges ( Command/NotifyChanges.hs, dist/build/git-annex/git-annex-tmp/Command/NotifyChanges.o )
[470 of 633] Compiling Command.Multicast ( Command/Multicast.hs, dist/build/git-annex/git-annex-tmp/Command/Multicast.o )
[471 of 633] Compiling Command.MetaData ( Command/MetaData.hs, dist/build/git-annex/git-annex-tmp/Command/MetaData.o )
[472 of 633] Compiling Command.MatchExpression ( Command/MatchExpression.hs, dist/build/git-annex/git-annex-tmp/Command/MatchExpression.o )
[473 of 633] Compiling Command.Map      ( Command/Map.hs, dist/build/git-annex/git-annex-tmp/Command/Map.o )
[474 of 633] Compiling Command.LookupKey ( Command/LookupKey.hs, dist/build/git-annex/git-annex-tmp/Command/LookupKey.o )
[475 of 633] Compiling Command.Log      ( Command/Log.hs, dist/build/git-annex/git-annex-tmp/Command/Log.o )
[476 of 633] Compiling Command.LockContent ( Command/LockContent.hs, dist/build/git-annex/git-annex-tmp/Command/LockContent.o )
[477 of 633] Compiling Command.Lock     ( Command/Lock.hs, dist/build/git-annex/git-annex-tmp/Command/Lock.o )
[478 of 633] Compiling Command.List     ( Command/List.hs, dist/build/git-annex/git-annex-tmp/Command/List.o )
[479 of 633] Compiling Command.Inprogress ( Command/Inprogress.hs, dist/build/git-annex/git-annex-tmp/Command/Inprogress.o )
[480 of 633] Compiling Command.InitRemote ( Command/InitRemote.hs, dist/build/git-annex/git-annex-tmp/Command/InitRemote.o )
[481 of 633] Compiling Command.Init     ( Command/Init.hs, dist/build/git-annex/git-annex-tmp/Command/Init.o )
[482 of 633] Compiling Command.Info     ( Command/Info.hs, dist/build/git-annex/git-annex-tmp/Command/Info.o )
[483 of 633] Compiling Command.Indirect ( Command/Indirect.hs, dist/build/git-annex/git-annex-tmp/Command/Indirect.o )
[484 of 633] Compiling Command.InAnnex  ( Command/InAnnex.hs, dist/build/git-annex/git-annex-tmp/Command/InAnnex.o )
[485 of 633] Compiling Command.GroupWanted ( Command/GroupWanted.hs, dist/build/git-annex/git-annex-tmp/Command/GroupWanted.o )
[486 of 633] Compiling Command.Group    ( Command/Group.hs, dist/build/git-annex/git-annex-tmp/Command/Group.o )
[487 of 633] Compiling Command.GCryptSetup ( Command/GCryptSetup.hs, dist/build/git-annex/git-annex-tmp/Command/GCryptSetup.o )
[488 of 633] Compiling Command.FuzzTest ( Command/FuzzTest.hs, dist/build/git-annex/git-annex-tmp/Command/FuzzTest.o )
[489 of 633] Compiling Command.Fsck     ( Command/Fsck.hs, dist/build/git-annex/git-annex-tmp/Command/Fsck.o )
[490 of 633] Compiling Command.Migrate  ( Command/Migrate.hs, dist/build/git-annex/git-annex-tmp/Command/Migrate.o )
[491 of 633] Compiling Command.FromKey  ( Command/FromKey.hs, dist/build/git-annex/git-annex-tmp/Command/FromKey.o )
[492 of 633] Compiling Command.RegisterUrl ( Command/RegisterUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RegisterUrl.o )
[493 of 633] Compiling Command.Forget   ( Command/Forget.hs, dist/build/git-annex/git-annex-tmp/Command/Forget.o )
[494 of 633] Compiling Command.Fix      ( Command/Fix.hs, dist/build/git-annex/git-annex-tmp/Command/Fix.o )
[495 of 633] Compiling Command.PreCommit ( Command/PreCommit.hs, dist/build/git-annex/git-annex-tmp/Command/PreCommit.o )
Command/PreCommit.hs:19:1: warning: [-Wunused-imports]
    The import of ‘Annex.LockFile’ is redundant
      except perhaps to import instances from ‘Annex.LockFile’
    To import instances alone, use: import Annex.LockFile()
   |
19 | import Annex.LockFile
   | ^^^^^^^^^^^^^^^^^^^^^
[496 of 633] Compiling Command.Find     ( Command/Find.hs, dist/build/git-annex/git-annex-tmp/Command/Find.o )
[497 of 633] Compiling Command.FindRef  ( Command/FindRef.hs, dist/build/git-annex/git-annex-tmp/Command/FindRef.o )
[498 of 633] Compiling Command.Export   ( Command/Export.hs, dist/build/git-annex/git-annex-tmp/Command/Export.o )
[499 of 633] Compiling Command.Expire   ( Command/Expire.hs, dist/build/git-annex/git-annex-tmp/Command/Expire.o )
[500 of 633] Compiling Command.ExamineKey ( Command/ExamineKey.hs, dist/build/git-annex/git-annex-tmp/Command/ExamineKey.o )
[501 of 633] Compiling Command.EnableTor ( Command/EnableTor.hs, dist/build/git-annex/git-annex-tmp/Command/EnableTor.o )
[502 of 633] Compiling Command.EnableRemote ( Command/EnableRemote.hs, dist/build/git-annex/git-annex-tmp/Command/EnableRemote.o )
[503 of 633] Compiling Command.DropKey  ( Command/DropKey.hs, dist/build/git-annex/git-annex-tmp/Command/DropKey.o )
[504 of 633] Compiling Command.Drop     ( Command/Drop.hs, dist/build/git-annex/git-annex-tmp/Command/Drop.o )
[505 of 633] Compiling Command.Move     ( Command/Move.hs, dist/build/git-annex/git-annex-tmp/Command/Move.o )
[506 of 633] Compiling Command.Get      ( Command/Get.hs, dist/build/git-annex/git-annex-tmp/Command/Get.o )
[507 of 633] Compiling Command.Mirror   ( Command/Mirror.hs, dist/build/git-annex/git-annex-tmp/Command/Mirror.o )
[508 of 633] Compiling Command.DropUnused ( Command/DropUnused.hs, dist/build/git-annex/git-annex-tmp/Command/DropUnused.o )
[509 of 633] Compiling Command.Direct   ( Command/Direct.hs, dist/build/git-annex/git-annex-tmp/Command/Direct.o )
[510 of 633] Compiling Command.DiffDriver ( Command/DiffDriver.hs, dist/build/git-annex/git-annex-tmp/Command/DiffDriver.o )
[511 of 633] Compiling Command.Describe ( Command/Describe.hs, dist/build/git-annex/git-annex-tmp/Command/Describe.o )
[512 of 633] Compiling Command.Dead     ( Command/Dead.hs, dist/build/git-annex/git-annex-tmp/Command/Dead.o )
[513 of 633] Compiling Command.Copy     ( Command/Copy.hs, dist/build/git-annex/git-annex-tmp/Command/Copy.o )
[514 of 633] Compiling Command.ContentLocation ( Command/ContentLocation.hs, dist/build/git-annex/git-annex-tmp/Command/ContentLocation.o )
[515 of 633] Compiling Command.Config   ( Command/Config.hs, dist/build/git-annex/git-annex-tmp/Command/Config.o )
[516 of 633] Compiling Command.Commit   ( Command/Commit.hs, dist/build/git-annex/git-annex-tmp/Command/Commit.o )
[517 of 633] Compiling Command.CheckPresentKey ( Command/CheckPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/CheckPresentKey.o )
[518 of 633] Compiling Command.CalcKey  ( Command/CalcKey.hs, dist/build/git-annex/git-annex-tmp/Command/CalcKey.o )
[519 of 633] Compiling Command.Benchmark ( Command/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Command/Benchmark.o )
[520 of 633] Compiling Command.Adjust   ( Command/Adjust.hs, dist/build/git-annex/git-annex-tmp/Command/Adjust.o )
[521 of 633] Compiling Command.AddUnused ( Command/AddUnused.hs, dist/build/git-annex/git-annex-tmp/Command/AddUnused.o )
[522 of 633] Compiling Command.Add      ( Command/Add.hs, dist/build/git-annex/git-annex-tmp/Command/Add.o )
[523 of 633] Compiling Command.AddUrl   ( Command/AddUrl.hs, dist/build/git-annex/git-annex-tmp/Command/AddUrl.o )
[524 of 633] Compiling Command.ImportFeed ( Command/ImportFeed.hs, dist/build/git-annex/git-annex-tmp/Command/ImportFeed.o )
[525 of 633] Compiling CmdLine          ( CmdLine.hs, dist/build/git-annex/git-annex-tmp/CmdLine.o )
[526 of 633] Compiling Benchmark        ( Benchmark.hs, dist/build/git-annex/git-annex-tmp/Benchmark.o )
[527 of 633] Compiling Annex.Import     ( Annex/Import.hs, dist/build/git-annex/git-annex-tmp/Annex/Import.o )
[528 of 633] Compiling Command.Import   ( Command/Import.hs, dist/build/git-annex/git-annex-tmp/Command/Import.o )
[529 of 633] Compiling Annex.Drop       ( Annex/Drop.hs, dist/build/git-annex/git-annex-tmp/Annex/Drop.o )
[530 of 633] Compiling Command.Sync     ( Command/Sync.hs, dist/build/git-annex/git-annex-tmp/Command/Sync.o )
[531 of 633] Compiling Command.Undo     ( Command/Undo.hs, dist/build/git-annex/git-annex-tmp/Command/Undo.o )
[532 of 633] Compiling Command.PostReceive ( Command/PostReceive.hs, dist/build/git-annex/git-annex-tmp/Command/PostReceive.o )
[533 of 633] Compiling Command.Merge    ( Command/Merge.hs, dist/build/git-annex/git-annex-tmp/Command/Merge.o )
[534 of 633] Compiling Command.Help     ( Command/Help.hs, dist/build/git-annex/git-annex-tmp/Command/Help.o )
[535 of 633] Compiling CmdLine.GitAnnexShell.Checks ( CmdLine/GitAnnexShell/Checks.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Checks.o )
[536 of 633] Compiling Command.P2PStdIO ( Command/P2PStdIO.hs, dist/build/git-annex/git-annex-tmp/Command/P2PStdIO.o )
[537 of 633] Compiling Command.ConfigList ( Command/ConfigList.hs, dist/build/git-annex/git-annex-tmp/Command/ConfigList.o )
[538 of 633] Compiling CmdLine.GitAnnexShell ( CmdLine/GitAnnexShell.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell.o )
[539 of 633] Compiling Utility.Verifiable ( Utility/Verifiable.hs, dist/build/git-annex/git-annex-tmp/Utility/Verifiable.o )
[540 of 633] Compiling Test             ( Test.hs, dist/build/git-annex/git-annex-tmp/Test.o )
[541 of 633] Compiling Assistant.Pairing ( Assistant/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing.o )
[542 of 633] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o )
[543 of 633] Compiling Assistant.Types.TransferrerPool ( Assistant/Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferrerPool.o )
[544 of 633] Compiling Assistant.Monad  ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o )
[545 of 633] Compiling Assistant.Types.NamedThread ( Assistant/Types/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/NamedThread.o )
[546 of 633] Compiling Assistant.Common ( Assistant/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/Common.o )
[547 of 633] Compiling Assistant.WebApp.Pairing ( Assistant/WebApp/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Pairing.o )
[548 of 633] Compiling Assistant.Unused ( Assistant/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/Unused.o )
[549 of 633] Compiling Assistant.TransferrerPool ( Assistant/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferrerPool.o )
[550 of 633] Compiling Assistant.ScanRemotes ( Assistant/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/ScanRemotes.o )
[551 of 633] Compiling Assistant.RepoProblem ( Assistant/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/RepoProblem.o )
[552 of 633] Compiling Assistant.RemoteControl ( Assistant/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/RemoteControl.o )
[553 of 633] Compiling Assistant.Pushes ( Assistant/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pushes.o )
[554 of 633] Compiling Assistant.MakeRemote ( Assistant/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRemote.o )
[555 of 633] Compiling Assistant.Install ( Assistant/Install.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install.o )
[556 of 633] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/DaemonStatus.o )
[557 of 633] Compiling Assistant.TransferQueue ( Assistant/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferQueue.o )
[558 of 633] Compiling Assistant.Threads.Glacier ( Assistant/Threads/Glacier.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Glacier.o )
[559 of 633] Compiling Assistant.Threads.DaemonStatus ( Assistant/Threads/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/DaemonStatus.o )
[560 of 633] Compiling Assistant.Drop   ( Assistant/Drop.hs, dist/build/git-annex/git-annex-tmp/Assistant/Drop.o )
[561 of 633] Compiling Assistant.CredPairCache ( Assistant/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/CredPairCache.o )
[562 of 633] Compiling Assistant.Commits ( Assistant/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Commits.o )
[563 of 633] Compiling Assistant.Threads.Exporter ( Assistant/Threads/Exporter.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Exporter.o )
[564 of 633] Compiling Assistant.Changes ( Assistant/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Changes.o )
[565 of 633] Compiling Assistant.BranchChange ( Assistant/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/BranchChange.o )
[566 of 633] Compiling Assistant.Threads.ConfigMonitor ( Assistant/Threads/ConfigMonitor.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ConfigMonitor.o )
[567 of 633] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o )
[568 of 633] Compiling Utility.WebApp   ( Utility/WebApp.hs, dist/build/git-annex/git-annex-tmp/Utility/WebApp.o )
[569 of 633] Compiling Utility.Yesod    ( Utility/Yesod.hs, dist/build/git-annex/git-annex-tmp/Utility/Yesod.o )
[570 of 633] Compiling Assistant.WebApp.Types ( Assistant/WebApp/Types.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Types.o )
[571 of 633] Compiling Assistant.WebApp.Form ( Assistant/WebApp/Form.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Form.o )
[572 of 633] Compiling Assistant.WebApp ( Assistant/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp.o )
[573 of 633] Compiling Assistant.WebApp.Notifications ( Assistant/WebApp/Notifications.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Notifications.o )
[574 of 633] Compiling Assistant.WebApp.SideBar ( Assistant/WebApp/SideBar.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/SideBar.o )
[575 of 633] Compiling Assistant.WebApp.Page ( Assistant/WebApp/Page.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Page.o )
[576 of 633] Compiling Assistant.WebApp.Common ( Assistant/WebApp/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Common.o )
[577 of 633] Compiling Assistant.WebApp.Documentation ( Assistant/WebApp/Documentation.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Documentation.o )
[578 of 633] Compiling Assistant.WebApp.Configurators.Unused ( Assistant/WebApp/Configurators/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Unused.o )
[579 of 633] Compiling Assistant.WebApp.Configurators.Preferences ( Assistant/WebApp/Configurators/Preferences.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Preferences.o )
[580 of 633] Compiling Assistant.MakeRepo ( Assistant/MakeRepo.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRepo.o )
[581 of 633] Compiling Assistant.Types.UrlRenderer ( Assistant/Types/UrlRenderer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/UrlRenderer.o )
[582 of 633] Compiling Assistant.Alert  ( Assistant/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert.o )
[583 of 633] Compiling Assistant.TransferSlots ( Assistant/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferSlots.o )
[584 of 633] Compiling Assistant.Threads.Transferrer ( Assistant/Threads/Transferrer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Transferrer.o )
[585 of 633] Compiling Assistant.Threads.TransferWatcher ( Assistant/Threads/TransferWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferWatcher.o )
[586 of 633] Compiling Assistant.Threads.TransferPoller ( Assistant/Threads/TransferPoller.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferPoller.o )
[587 of 633] Compiling Assistant.Threads.Watcher ( Assistant/Threads/Watcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Watcher.o )
[588 of 633] Compiling Assistant.Threads.RemoteControl ( Assistant/Threads/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/RemoteControl.o )
[589 of 633] Compiling Assistant.Threads.Committer ( Assistant/Threads/Committer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Committer.o )
[590 of 633] Compiling Assistant.NamedThread ( Assistant/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/NamedThread.o )
[591 of 633] Compiling Assistant.Sync   ( Assistant/Sync.hs, dist/build/git-annex/git-annex-tmp/Assistant/Sync.o )
[592 of 633] Compiling Assistant.WebApp.RepoList ( Assistant/WebApp/RepoList.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoList.o )
[593 of 633] Compiling Assistant.WebApp.DashBoard ( Assistant/WebApp/DashBoard.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/DashBoard.o )
[594 of 633] Compiling Assistant.WebApp.Configurators ( Assistant/WebApp/Configurators.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators.o )
[595 of 633] Compiling Assistant.WebApp.MakeRemote ( Assistant/WebApp/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/MakeRemote.o )
[596 of 633] Compiling Assistant.WebApp.Gpg ( Assistant/WebApp/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Gpg.o )
[597 of 633] Compiling Assistant.WebApp.Configurators.WebDAV ( Assistant/WebApp/Configurators/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/WebDAV.o )
[598 of 633] Compiling Assistant.WebApp.Configurators.Ssh ( Assistant/WebApp/Configurators/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Ssh.o )
[599 of 633] Compiling Assistant.WebApp.Configurators.AWS ( Assistant/WebApp/Configurators/AWS.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/AWS.o )
[600 of 633] Compiling Assistant.WebApp.Configurators.IA ( Assistant/WebApp/Configurators/IA.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/IA.o )
[601 of 633] Compiling Assistant.WebApp.Configurators.Edit ( Assistant/WebApp/Configurators/Edit.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Edit.o )
[602 of 633] Compiling Assistant.Threads.Pusher ( Assistant/Threads/Pusher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Pusher.o )
[603 of 633] Compiling Assistant.Threads.NetWatcher ( Assistant/Threads/NetWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/NetWatcher.o )
[604 of 633] Compiling Assistant.Threads.Merger ( Assistant/Threads/Merger.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Merger.o )
[605 of 633] Compiling Assistant.Repair ( Assistant/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/Repair.o )
[606 of 633] Compiling Assistant.WebApp.Repair ( Assistant/WebApp/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Repair.o )
[607 of 633] Compiling Assistant.Threads.ProblemFixer ( Assistant/Threads/ProblemFixer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ProblemFixer.o )
[608 of 633] Compiling Assistant.Pairing.MakeRemote ( Assistant/Pairing/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/MakeRemote.o )
[609 of 633] Compiling Assistant.WebApp.Configurators.Pairing ( Assistant/WebApp/Configurators/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Pairing.o )
[610 of 633] Compiling Assistant.Threads.PairListener ( Assistant/Threads/PairListener.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/PairListener.o )
[611 of 633] Compiling Assistant.Restart ( Assistant/Restart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Restart.o )
[612 of 633] Compiling Assistant.WebApp.OtherRepos ( Assistant/WebApp/OtherRepos.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/OtherRepos.o )
[613 of 633] Compiling Assistant.WebApp.Control ( Assistant/WebApp/Control.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Control.o )
[614 of 633] Compiling Assistant.WebApp.Configurators.Local ( Assistant/WebApp/Configurators/Local.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Local.o )
[615 of 633] Compiling Assistant.Upgrade ( Assistant/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/Upgrade.o )
[616 of 633] Compiling Assistant.WebApp.Configurators.Upgrade ( Assistant/WebApp/Configurators/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Upgrade.o )
[617 of 633] Compiling Assistant.Threads.Upgrader ( Assistant/Threads/Upgrader.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Upgrader.o )
[618 of 633] Compiling Assistant.Threads.UpgradeWatcher ( Assistant/Threads/UpgradeWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/UpgradeWatcher.o )
[619 of 633] Compiling Assistant.Threads.SanityChecker ( Assistant/Threads/SanityChecker.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/SanityChecker.o )
[620 of 633] Compiling Assistant.Fsck   ( Assistant/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/Fsck.o )
[621 of 633] Compiling Assistant.WebApp.Configurators.Fsck ( Assistant/WebApp/Configurators/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Fsck.o )
[622 of 633] Compiling Assistant.Threads.MountWatcher ( Assistant/Threads/MountWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/MountWatcher.o )
[623 of 633] Compiling Assistant.Threads.Cronner ( Assistant/Threads/Cronner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Cronner.o )
[624 of 633] Compiling Assistant.DeleteRemote ( Assistant/DeleteRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/DeleteRemote.o )
[625 of 633] Compiling Assistant.WebApp.Configurators.Delete ( Assistant/WebApp/Configurators/Delete.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Delete.o )
[626 of 633] Compiling Assistant.Threads.WebApp ( Assistant/Threads/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/WebApp.o )
[627 of 633] Compiling Assistant.Threads.TransferScanner ( Assistant/Threads/TransferScanner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferScanner.o )
[628 of 633] Compiling Assistant        ( Assistant.hs, dist/build/git-annex/git-annex-tmp/Assistant.o )
[629 of 633] Compiling Command.WebApp   ( Command/WebApp.hs, dist/build/git-annex/git-annex-tmp/Command/WebApp.o )
[630 of 633] Compiling Command.Watch    ( Command/Watch.hs, dist/build/git-annex/git-annex-tmp/Command/Watch.o )
[631 of 633] Compiling Command.Assistant ( Command/Assistant.hs, dist/build/git-annex/git-annex-tmp/Command/Assistant.o )
[632 of 633] Compiling CmdLine.GitAnnex ( CmdLine/GitAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex.o )
[633 of 633] Compiling Main             ( git-annex.hs, dist/build/git-annex/git-annex-tmp/Main.o )
Linking dist/build/git-annex/git-annex ...
+ LC_ALL=C
+ TZ=UTC
+ ikiwiki doc html -v --wikiname git-annex --plugin=goodstuff --no-usedirs --disable-plugin=openid --plugin=sidebar --underlaydir=/dev/null --set deterministic=1 --disable-plugin=shortcut --disable-plugin=smiley --plugin=comments --set 'comments_pagespec=*' '--exclude=news/.*' '--exclude=design/assistant/blog/*' '--exclude=bugs/*' '--exclude=todo/*' '--exclude=forum/*' '--exclude=users/*' '--exclude=devblog/*' --exclude=thanks
refreshing wiki..
scanning git-annex-multicast.mdwn
scanning git-annex-unlock.mdwn
scanning git-annex-vicfg.mdwn
scanning git-annex-merge.mdwn
scanning git-annex-info.mdwn
scanning git-annex-direct.mdwn
scanning git-annex-diffdriver.mdwn
scanning git-annex-list.mdwn
scanning git-annex-unannex.mdwn
scanning git-annex-undo.mdwn
scanning git-annex-export.mdwn
scanning git-annex-remotedaemon.mdwn
scanning git-annex-reinject.mdwn
scanning git-annex-pre-commit.mdwn
scanning git-annex-setpresentkey.mdwn
scanning git-annex-dead.mdwn
scanning git-annex-enable-tor.mdwn
scanning git-annex-fix.mdwn
scanning git-annex-fuzztest.mdwn
scanning git-annex-dropunused.mdwn
scanning git-annex-ungroup.mdwn
scanning git-annex-find.mdwn
scanning git-annex.mdwn
scanning git-annex-repair.mdwn
scanning git-annex-proxy.mdwn
scanning git-annex-setkey.mdwn
scanning git-annex-version.mdwn
scanning git-annex-fsck.mdwn
scanning git-annex-schedule.mdwn
scanning git-annex-log.mdwn
scanning git-annex-import.mdwn
scanning git-annex-uninit.mdwn
scanning git-annex-wanted.mdwn
scanning git-annex-map.mdwn
scanning git-annex-vpop.mdwn
scanning git-annex-group.mdwn
scanning git-annex-lookupkey.mdwn
scanning git-annex-edit.mdwn
scanning git-annex-semitrust.mdwn
scanning git-annex-examinekey.mdwn
scanning git-annex-add.mdwn
scanning git-annex-numcopies.mdwn
scanning git-annex-renameremote.mdwn
scanning git-annex-findref.mdwn
scanning git-annex-calckey.mdwn
scanning git-annex-status.mdwn
scanning git-annex-mirror.mdwn
scanning git-annex-get.mdwn
scanning git-annex-indirect.mdwn
scanning git-annex-p2p.mdwn
scanning logo_16x16.png
scanning git-annex-checkpresentkey.mdwn
scanning git-annex-shell.mdwn
scanning git-annex-resolvemerge.mdwn
scanning git-annex-required.mdwn
scanning git-annex-addurl.mdwn
scanning git-annex-matchexpression.mdwn
scanning git-remote-tor-annex.mdwn
scanning logo.svg
scanning git-annex-init.mdwn
scanning git-annex-vadd.mdwn
scanning git-annex-enableremote.mdwn
scanning git-annex-migrate.mdwn
scanning git-annex-testremote.mdwn
scanning git-annex-test.mdwn
scanning git-annex-view.mdwn
scanning git-annex-unused.mdwn
scanning git-annex-registerurl.mdwn
scanning git-annex-rmurl.mdwn
scanning git-annex-metadata.mdwn
scanning git-annex-move.mdwn
scanning git-annex-lock.mdwn
scanning git-annex-describe.mdwn
scanning git-annex-drop.mdwn
scanning git-annex-sync.mdwn
scanning git-annex-untrust.mdwn
scanning git-annex-inprogress.mdwn
scanning git-annex-fromkey.mdwn
scanning git-annex-addunused.mdwn
scanning git-annex-transferkeys.mdwn
scanning git-annex-copy.mdwn
scanning git-annex-expire.mdwn
scanning git-annex-contentlocation.mdwn
scanning git-annex-trust.mdwn
scanning git-annex-upgrade.mdwn
scanning git-annex-readpresentkey.mdwn
scanning git-annex-vfilter.mdwn
scanning git-annex-matching-options.mdwn
scanning git-annex-vcycle.mdwn
scanning git-annex-transferkey.mdwn
scanning git-annex-webapp.mdwn
scanning git-annex-dropkey.mdwn
scanning git-annex-groupwanted.mdwn
scanning git-annex-preferred-content.mdwn
scanning git-annex-initremote.mdwn
scanning git-annex-smudge.mdwn
scanning git-annex-assistant.mdwn
scanning git-annex-reinit.mdwn
scanning git-annex-forget.mdwn
scanning git-annex-adjust.mdwn
scanning git-annex-importfeed.mdwn
scanning git-annex-whereis.mdwn
scanning git-annex-watch.mdwn
scanning git-annex-rekey.mdwn
scanning index.mdwn
scanning license/GPL
scanning license/AGPL
scanning ikiwiki/ikiwiki.js
scanning ikiwiki/relativedate.js
scanning ikiwiki/toggle.js
building git-annex-multicast.mdwn
building git-annex-unlock.mdwn
building git-annex-vicfg.mdwn
building git-annex-merge.mdwn
building git-annex-info.mdwn
building git-annex-direct.mdwn
building git-annex-diffdriver.mdwn
building git-annex-list.mdwn
building git-annex-unannex.mdwn
building git-annex-undo.mdwn
building git-annex-export.mdwn
building git-annex-remotedaemon.mdwn
building git-annex-reinject.mdwn
building git-annex-pre-commit.mdwn
building git-annex-setpresentkey.mdwn
building git-annex-dead.mdwn
building git-annex-enable-tor.mdwn
building git-annex-fix.mdwn
building git-annex-fuzztest.mdwn
building git-annex-dropunused.mdwn
building git-annex-ungroup.mdwn
building git-annex-find.mdwn
building git-annex.mdwn
building git-annex-repair.mdwn
building git-annex-proxy.mdwn
building git-annex-setkey.mdwn
building git-annex-version.mdwn
building git-annex-fsck.mdwn
building git-annex-schedule.mdwn
building git-annex-log.mdwn
building git-annex-import.mdwn
building git-annex-uninit.mdwn
building git-annex-wanted.mdwn
building git-annex-map.mdwn
building git-annex-vpop.mdwn
building git-annex-group.mdwn
building git-annex-lookupkey.mdwn
building git-annex-edit.mdwn
building git-annex-semitrust.mdwn
building git-annex-examinekey.mdwn
building git-annex-add.mdwn
building git-annex-numcopies.mdwn
building git-annex-renameremote.mdwn
building git-annex-findref.mdwn
building git-annex-calckey.mdwn
building git-annex-status.mdwn
building git-annex-mirror.mdwn
building git-annex-get.mdwn
building git-annex-indirect.mdwn
building git-annex-p2p.mdwn
building logo_16x16.png
building git-annex-checkpresentkey.mdwn
building git-annex-shell.mdwn
building git-annex-resolvemerge.mdwn
building git-annex-required.mdwn
building git-annex-addurl.mdwn
building git-annex-matchexpression.mdwn
building git-remote-tor-annex.mdwn
building logo.svg
building git-annex-init.mdwn
building git-annex-vadd.mdwn
building git-annex-enableremote.mdwn
building git-annex-migrate.mdwn
building git-annex-testremote.mdwn
building git-annex-test.mdwn
building git-annex-view.mdwn
building git-annex-unused.mdwn
building git-annex-registerurl.mdwn
building git-annex-rmurl.mdwn
building git-annex-metadata.mdwn
building git-annex-move.mdwn
building git-annex-lock.mdwn
building git-annex-describe.mdwn
building git-annex-drop.mdwn
building git-annex-sync.mdwn
building git-annex-untrust.mdwn
building git-annex-inprogress.mdwn
building git-annex-fromkey.mdwn
building git-annex-addunused.mdwn
building git-annex-transferkeys.mdwn
building git-annex-copy.mdwn
building git-annex-expire.mdwn
building git-annex-contentlocation.mdwn
building git-annex-trust.mdwn
building git-annex-upgrade.mdwn
building git-annex-readpresentkey.mdwn
building git-annex-vfilter.mdwn
building git-annex-matching-options.mdwn
building git-annex-vcycle.mdwn
building git-annex-transferkey.mdwn
building git-annex-webapp.mdwn
building git-annex-dropkey.mdwn
building git-annex-groupwanted.mdwn
building git-annex-preferred-content.mdwn
building git-annex-initremote.mdwn
building git-annex-smudge.mdwn
building git-annex-assistant.mdwn
building git-annex-reinit.mdwn
building git-annex-forget.mdwn
building git-annex-adjust.mdwn
building git-annex-importfeed.mdwn
building git-annex-whereis.mdwn
building git-annex-watch.mdwn
building git-annex-rekey.mdwn
building index.mdwn
building license/GPL
building license/AGPL
building ikiwiki/ikiwiki.js
building ikiwiki/relativedate.js
building ikiwiki/toggle.js
done
Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.FlWVCE
+ RPM_EC=0
++ jobs -p
+ exit 0
+ umask 022
+ cd /builddir/build/BUILD
+ '[' /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64 '!=' / ']'
+ rm -rf /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
++ dirname /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
+ mkdir -p /builddir/build/BUILDROOT
+ mkdir /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
+ cd git-annex-8.20200330
+ '[' -x Setup ']'
+ LANG=C.utf8
+ ./Setup copy --destdir=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
Installing executable git-annex in /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/bin
Warning: Executable installed in
/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/bin
++ pkg-config --variable=completionsdir bash-completion
+ bash_completion_dir=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/bash-completion/completions
+ mkdir -p /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/bash-completion/completions
+ install -m 644 bash-completion.bash /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/bash-completion/completions/git-annex
+ /usr/lib/rpm/check-buildroot
+ /usr/lib/rpm/redhat/brp-ldconfig
+ /usr/lib/rpm/brp-compress
+ /usr/lib/rpm/brp-strip /usr/bin/strip
+ /usr/lib/rpm/brp-strip-comment-note /usr/bin/strip /usr/bin/objdump
+ /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip
+ /usr/lib/rpm/redhat/brp-python-bytecompile /usr/bin/python 1 0
+ /usr/lib/rpm/brp-python-hardlink
+ /usr/lib/rpm/redhat/brp-mangle-shebangs
Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.aMHUCH
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ mkdir test
+ pushd test
~/build/BUILD/git-annex-8.20200330/test ~/build/BUILD/git-annex-8.20200330
+ PATH=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin
+ git annex test
Tests
  QuickCheck
    prop_encode_decode_roundtrip:                         OK (0.07s)
      +++ OK, passed 1000 tests.
    prop_encode_c_decode_c_roundtrip:                     OK (0.05s)
      +++ OK, passed 1000 tests.
    prop_isomorphic_key_encode:                           OK (0.05s)
      +++ OK, passed 1000 tests.
    prop_isomorphic_shellEscape:                          OK (0.03s)
      +++ OK, passed 1000 tests.
    prop_isomorphic_shellEscape_multiword:                OK (1.07s)
      +++ OK, passed 1000 tests.
    prop_isomorphic_configEscape:                         OK (0.02s)
      +++ OK, passed 1000 tests.
    prop_parse_show_Config:                               OK (0.04s)
      +++ OK, passed 1000 tests.
    prop_upFrom_basics:                                   OK (0.02s)
      +++ OK, passed 1000 tests.
    prop_relPathDirToFile_basics:                         OK (0.04s)
      +++ OK, passed 1000 tests.
    prop_relPathDirToFile_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.11s)
      +++ OK, passed 1000 tests.
    prop_segment_regressionTest:                          OK
      +++ OK, passed 1 test.
    prop_read_write_transferinfo:                         OK (0.07s)
      +++ OK, passed 1000 tests.
    prop_read_show_inodecache:                            OK (0.02s)
      +++ OK, passed 1000 tests.
    prop_parse_build_presence_log:                        OK (2.09s)
      +++ OK, passed 1000 tests.
    prop_parse_build_contentidentifier_log:               OK (1.85s)
      +++ 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 (0.01s)
      +++ OK, passed 1000 tests.
    prop_past_sane:                                       OK
      +++ OK, passed 1 test.
    prop_duration_roundtrips:                             OK
      +++ OK, passed 1000 tests.
    prop_metadata_sane:                                   OK (1.10s)
      +++ OK, passed 1000 tests.
    prop_metadata_serialize:                              OK (1.16s)
      +++ OK, passed 1000 tests.
    prop_branchView_legal:                                OK (0.81s)
      +++ OK, passed 1000 tests.
    prop_viewPath_roundtrips:                             OK (0.05s)
      +++ OK, passed 1000 tests.
    prop_view_roundtrips:                                 OK (0.57s)
      +++ OK, passed 1000 tests.
    prop_viewedFile_rountrips:                            OK (0.01s)
      +++ OK, passed 1000 tests.
    prop_b64_roundtrips:                                  OK
      +++ OK, passed 1000 tests.
    prop_standardGroups_parse:                            OK
      +++ OK, passed 1 test.
    sha1 stable:                                          OK
      +++ OK, passed 1 test.
    sha2_224 stable:                                      Init Tests
OK  init: 
      +++ 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.
  Unit Tests v8 adjusted unlocked branch
    add dup:                                              init test repo (scanning for unlocked files...)
ok
(recording state in git...)
[master (root-commit) 7433823] empty
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
OK (0.17s)
  add:  add foo 

100%  20 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
add sha1foo 

100%  25 B            246 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.39s)
All 2 tests passed (0.56s)
[adjusted/master(unlocked) 156d266] empty
adjust ok
add foodup 

100%  20 B              5 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.52s)
    add extras:                                           [adjusted/master(unlocked) e0d1b69] empty
adjust ok
add apple 


ok
(recording state in git...)
OK (0.43s)
    export_import:                                        [adjusted/master(unlocked) e0d1b69] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch adjusted/master(unlocked)
Your branch is ahead of 'origin/adjusted/master(unlocked)' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
ok
export foo bar.c ok
export foo foo ok
export foo sha1foo ok
(recording state in git...)
list foo ok
import foo import 

100%  16 B             79 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master (Merging into master...) Updating e1cacd1..27d50aa
Fast-forward
 bar.c  | 2 +-
 import | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 120000 bar.c
 create mode 120000 import
(Merging into adjusted branch...) 
Updating 4d2d4f5..40f2800
Fast-forward
 bar.c  | 2 +-
 import | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 import
ok
add import 

100%  23 B             14 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 1017e27] git-annex in .t/tmprepo2
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
unexport foo import ok
export foo import ok
(recording state in git...)
add import 

100%  23 B             15 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) d323b40] git-annex in .t/tmprepo2
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
  unsafe to overwrite file
git-annex: export: 2 failed
list foo ok
import foo import 

100%  23 B            104 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
CONFLICT (content): Merge conflict in import
Automatic merge failed; fix conflicts and then commit the result.
add import 

100%  23 B              5 KiB/s 0s
                                  
ok
add import 

100%  23 B             79 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 71b116b] git-annex in .t/tmprepo2
ok
  unable to propigate merge commit Ref "71b116b2fb69e0c4054be142c80fbdbfeac1c470" back to Ref "refs/heads/master"
unexport foo import ok
export foo import ok
(recording state in git...)
OK (2.21s)
    export_import_subdir:                                 [adjusted/master(unlocked) 0b36683] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
[adjusted/master(unlocked) d8d911e] moved
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename foo => subdir/foo (100%)
commit 
On branch adjusted/master(unlocked)
Your branch is ahead of 'origin/adjusted/master(unlocked)' by 2 commits.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
ok
list foo ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master (Merging into master...) Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating ec7b99a..0f192de
Fast-forward
ok
export foo foo ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
merge foo/master ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
merge foo/master (Merging into master...) Updating 27b7b9e..29fe213
Fast-forward
(Merging into adjusted branch...) 
Updating c766c30..7f8482a
Fast-forward
ok
(recording state in git...)
OK (1.31s)
    shared clone:                                         [adjusted/master(unlocked) 935b231] empty
adjust ok
OK (0.26s)
    log:                                                  [adjusted/master(unlocked) 935b231] empty
adjust ok
+ Tue, 31 Mar 2020 20:01:33 UTC foo | a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
OK (0.30s)
    import:                                               [adjusted/master(unlocked) 935b231] empty
adjust ok
import import1/f ok
(recording state in git...)
import import2/f ok
(recording state in git...)
import import3/f (duplicate; skipping) ok
import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import5/f ok
(recording state in git...)
drop import1/f ok
(recording state in git...)
  Could not verify that the content is still present in the annex; not removing from the import location.
git-annex: import: 1 failed
OK (0.85s)
    reinject:                                             [adjusted/master(unlocked) a2a0e15] empty
adjust ok
reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.51s)
    unannex (no copy):                                    [adjusted/master(unlocked) fa10f41] empty
adjust ok
OK (0.31s)
    unannex (with copy):                                  [adjusted/master(unlocked) fa10f41] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
OK (0.49s)
    drop (no remote):                                     [adjusted/master(unlocked) fa10f41] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
drop foo ok
(recording state in git...)
OK (0.61s)
    drop (with remote):                                   [adjusted/master(unlocked) 0e0390c] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
git-annex: drop: 1 failed
numcopies 1 ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.71s)
    drop (untrusted remote):                              [adjusted/master(unlocked) 17e11ca] empty
adjust ok
untrust origin ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.53s)
    get:                                                  [adjusted/master(unlocked) 17e11ca] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
OK (0.54s)
    get (ssh remote):                                     [adjusted/master(unlocked) 779a2eb] empty
adjust ok
get foo (from origin...) 

100%  20 B             1013 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.54s)
    move:                                                 [adjusted/master(unlocked) 779a2eb] empty
adjust ok
move foo (from origin...) 


(checksum...) (recording state in git...)
ok
(recording state in git...)
move foo (to origin...) 


(checksum...) (recording state in git...)
ok
(recording state in git...)
OK (0.91s)
    move (ssh remote):                                    [adjusted/master(unlocked) 3a25fed] empty
adjust ok
move foo (from origin...) 

100%  20 B              938 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
move foo (to origin...) 

100%  20 B              5 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.98s)
    copy:                                                 [adjusted/master(unlocked) 98d2002] empty
adjust ok
copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.82s)
    lock:                                                 [adjusted/master(unlocked) 83b5fde] empty
adjust ok
add newfile 

100%  3 B               572 B/s 0s
                                  
ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo ok
(recording state in git...)
unlock foo ok
(recording state in git...)
drop foo (unsafe) 
  Could only verify the existence of 0 out of 1 necessary copies
  Rather than dropping this file, try using: git annex move
  (Use --force to override this check, or adjust numcopies.)
failed
(recording state in git...)
git-annex: drop: 1 failed
OK (0.94s)
    lock --force:                                         [adjusted/master(unlocked) 2de2540] empty
adjust ok
upgrade ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo (checksum...) ok
(recording state in git...)
OK (0.56s)
    edit (no pre-commit):                                 [adjusted/master(unlocked) e9d40ae] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.60s)
    edit (pre-commit):                                    [adjusted/master(unlocked) e9d40ae] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.64s)
    partial commit:                                       [adjusted/master(unlocked) a24a967] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
OK (0.60s)
    fix:                                                  [adjusted/master(unlocked) a24a967] empty
adjust ok
OK (0.25s)
    trust:                                                [adjusted/master(unlocked) 5b397b4] empty
adjust ok
trust origin ok
(recording state in git...)
trust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
OK (0.69s)
    fsck (basics):                                        [adjusted/master(unlocked) 5b397b4] empty
adjust ok
fsck foo ok
fsck sha1foo ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
git-annex: fsck: 2 failed
numcopies 1 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.94s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.14s)
    fsck (local untrusted):                               [adjusted/master(unlocked) cf73ce4] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
   	bc0da61d-e96e-4cbe-92cb-d498765c8e3d -- .t/tmprepo27 [here]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
git-annex: fsck: 2 failed
trust . ok
(recording state in git...)
fsck foo (checksum...) ok
(recording state in git...)
OK (0.64s)
    fsck (remote untrusted):                              [adjusted/master(unlocked) 71d3d32] empty
adjust ok
numcopies 2 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.71s)
    fsck --from remote:                                   [adjusted/master(unlocked) 1ce0eea] empty
adjust ok
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.32s)
    migrate:                                              [adjusted/master(unlocked) 1ce0eea] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
OK (0.99s)
    migrate (via gitattributes):                          [adjusted/master(unlocked) c50eb71] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
OK (0.94s)
    unused:                                               [adjusted/master(unlocked) e927c50] empty
adjust ok
unused . (checking for unused data...) ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking origin/master...) (checking origin/HEAD...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) ok
commit 
[adjusted/master(unlocked) 67e34ce] git-annex in .t/tmprepo32
 1 file changed, 1 deletion(-)
 delete mode 100644 foo
ok
unused . (checking for unused data...) (checking origin/master...) (checking origin/HEAD...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
commit 
[adjusted/master(unlocked) 682f832] git-annex in .t/tmprepo32
 1 file changed, 1 deletion(-)
 delete mode 100644 sha1foo
ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
(recording state in git...)
OK (1.81s)
    describe:                                             [adjusted/master(unlocked) 6bbbe4b] empty
adjust ok
describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.35s)
    find:                                                 [adjusted/master(unlocked) 6bbbe4b] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
add dir/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.83s)
    merge:                                                [adjusted/master(unlocked) 1be4a6a] empty
adjust ok
merge git-annex ok
OK (0.30s)
    info:                                                 [adjusted/master(unlocked) 1be4a6a] empty
adjust ok
OK (0.30s)
    version:                                              [adjusted/master(unlocked) c04912a] empty
adjust ok
git-annex version: 8.20200330
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite
dependency versions: aws-0.21.1 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.4 feed-1.1.0.0 ghc-8.6.5 http-client-0.6.4 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0.1
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external
operating system: linux x86_64
supported repository versions: 8
upgrade supported from repository versions: 0 1 2 3 4 5 6 7
local repository version: 8
OK (0.29s)
    sync:                                                 [adjusted/master(unlocked) c04912a] empty
adjust ok
commit 
On branch adjusted/master(unlocked)
Your branch is ahead of 'origin/adjusted/master(unlocked)' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main0
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
wanted . ok
(recording state in git...)
commit 
On branch adjusted/master(unlocked)
Your branch and 'origin/adjusted/master(unlocked)' have diverged,
and have 5 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main0
   3d14f96..c00cf67  git-annex -> synced/git-annex
ok
drop foo ok
(recording state in git...)
commit 
On branch adjusted/master(unlocked)
Your branch and 'origin/adjusted/master(unlocked)' have diverged,
and have 5 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main0
   c00cf67..720cd7e  git-annex -> synced/git-annex
ok
OK (1.49s)
    concurrent get of dup key regression:                 [adjusted/master(unlocked) 79d3c04] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
get foo2 (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.79s)
    union merge regression:                               [adjusted/master(unlocked) 3b6c54d] empty
adjust ok
[adjusted/master(unlocked) 3b6c54d] empty
adjust ok
[adjusted/master(unlocked) 867b332] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo41
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
(Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 867b332..7c77e3b
Fast-forward
ok
pull r1 
From ../../.t/tmprepo40
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
ok
(merging r1/git-annex r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo41
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo40
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 3b6c54d..078ad07
Fast-forward
ok
pull r3 
From ../../.t/tmprepo42
 * [new branch]      adjusted/master(unlocked) -> r3/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r3/git-annex
 * [new branch]      master                    -> r3/master
 * [new branch]      synced/master             -> r3/synced/master
ok
pull r1 
From ../../.t/tmprepo40
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/git-annex          -> r1/synced/git-annex
 * [new branch]      synced/master             -> r1/synced/master
ok
push r3 
To ../../.t/tmprepo42
   aaf57ff..047b751  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
push r1 
To ../../.t/tmprepo40
   aaf57ff..047b751  master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 4f60859..047b751
Fast-forward
(Merging into adjusted branch...) 
Updating 3b6c54d..078ad07
Fast-forward
ok
pull r3 
From ../../.t/tmprepo42
 * [new branch]      adjusted/master(unlocked) -> r3/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r3/git-annex
 * [new branch]      master                    -> r3/master
 * [new branch]      synced/git-annex          -> r3/synced/git-annex
 * [new branch]      synced/master             -> r3/synced/master
ok
pull r2 
From ../../.t/tmprepo41
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/git-annex          -> r2/synced/git-annex
 * [new branch]      synced/master             -> r2/synced/master
ok
drop foo ok
(recording state in git...)
drop foo ok
(recording state in git...)
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo42
   60135a4..d56277c  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo41
   60135a4..64b17fc  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo42
   60135a4..74964a6  git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo41
   60135a4..74964a6  git-annex -> synced/git-annex
ok
OK (3.30s)
    adjusted branch merge regression:                     [adjusted/master(unlocked) 9793393] empty
adjust ok
[adjusted/master(unlocked) a824001] empty
adjust ok
upgrade ok
adjust ok
add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) aea05a3] git-annex in .t/tmprepo43
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo44
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
(Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating aea05a3..f652158
Fast-forward
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo44
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
upgrade ok
adjust ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 7c069fc] git-annex in .t/tmprepo44
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
merge synced/master (Merging into master...) Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 7c069fc..87b0ba7
Fast-forward
ok
pull r1 
From ../../.t/tmprepo43
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo43
   b1170ad..66ca972  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating b1170ad..66ca972
Fast-forward
(Merging into adjusted branch...) 
Updating b4d3b8d..ffa170a
Fast-forward
ok
pull r2 
From ../../.t/tmprepo44
 + a824001...0803180 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   f140c0f..effb6a7  git-annex                 -> r2/git-annex
   b1170ad..66ca972  master                    -> r2/master
   b1170ad..66ca972  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo43
 + b4d3b8d...0803180 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (2.25s)
    adjusted branch subtree regression:                   [adjusted/master(unlocked) 41e9c42] empty
adjust ok
upgrade ok
adjust ok
add a/b/c/d 

100%  3 B               764 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 4f5119e] git-annex in .t/tmprepo45
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/c/d
ok
add a/b/x/y 

100%  3 B               755 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 498fed6] git-annex in .t/tmprepo45
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (1.05s)
    conflict resolution:                                  [adjusted/master(unlocked) 2b1b305] empty
adjust ok
[adjusted/master(unlocked) 2b1b305] empty
adjust ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 003e8b4] git-annex in .t/tmprepo46
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 78854d5] git-annex in .t/tmprepo47
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo47
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 8104b42] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating e47e587..3e02a27
Fast-forward
 conflictor.variant-75dc               | 1 +
 conflictor => conflictor.variant-a507 | 0
 2 files changed, 1 insertion(+)
 create mode 100644 conflictor.variant-75dc
 rename conflictor => conflictor.variant-a507 (100%)
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo47
   3d2d6d7..8104b42  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 3d2d6d7..8104b42
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 120000 conflictor.variant-a507
(Merging into adjusted branch...) 
Updating 0e90309..5669293
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo46
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo47
 + 0e90309...a6a9d43 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (2.53s)
    conflict resolution (adjusted branch):                [adjusted/master(unlocked) a2ef43e] empty
adjust ok
[adjusted/master(unlocked) af6b5a7] empty
adjust ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 902f8fd] git-annex in .t/tmprepo48
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 3613cdb] git-annex in .t/tmprepo49
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
adjust ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo49
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 605a3c7] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating f12ddf4..114f6bd
Fast-forward
 conflictor.variant-75dc               | 1 +
 conflictor => conflictor.variant-a507 | 0
 2 files changed, 1 insertion(+)
 create mode 100644 conflictor.variant-75dc
 rename conflictor => conflictor.variant-a507 (100%)
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo49
   1c19c5e..605a3c7  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 1c19c5e..605a3c7
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 120000 conflictor.variant-a507
(Merging into adjusted branch...) 
Updating c9cbf5b..9aec45f
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo48
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo49
 + c9cbf5b...21fa5ac adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (2.46s)
    conflict resolution movein regression:                [adjusted/master(unlocked) 2395bd5] empty
adjust ok
[adjusted/master(unlocked) 2395bd5] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[adjusted/master(unlocked) 5bf6bc3] git-annex in .t/tmprepo50
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r2 
From ../../.t/tmprepo51
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo51
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[adjusted/master(unlocked) 739c3e2] git-annex in .t/tmprepo51
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
merge synced/master (Merging into master...) Auto-merging foo
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 2dd5cf6] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 739c3e2..1af094a
Fast-forward
 foo.variant-0b0e        | 1 +
 foo => foo.variant-bc25 | 0
 2 files changed, 1 insertion(+)
 create mode 100644 foo.variant-0b0e
 rename foo => foo.variant-bc25 (100%)
ok
pull r1 
From ../../.t/tmprepo50
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo50
   cd32faf..2dd5cf6  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating cd32faf..2dd5cf6
Fast-forward
 foo => foo.variant-0b0e | 0
 foo.variant-bc25        | 1 +
 2 files changed, 1 insertion(+)
 rename foo => foo.variant-0b0e (100%)
 create mode 120000 foo.variant-bc25
(Merging into adjusted branch...) 
Updating 7266dd1..a432dca
Fast-forward
 foo => foo.variant-0b0e | 0
 foo.variant-bc25        | 1 +
 2 files changed, 1 insertion(+)
 rename foo => foo.variant-0b0e (100%)
 create mode 100644 foo.variant-bc25
ok
pull r2 
From ../../.t/tmprepo51
 + 2395bd5...9b02008 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   2785bbc..808008a  git-annex                 -> r2/git-annex
   cd32faf..2dd5cf6  master                    -> r2/master
   cd32faf..2dd5cf6  synced/master             -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 


(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 


(checksum...) ok
(recording state in git...)
OK (2.43s)
    conflict resolution (mixed directory and file):       [adjusted/master(unlocked) 09dc93b] empty
adjust ok
[adjusted/master(unlocked) 09dc93b] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 9db8b33] git-annex in .t/tmprepo52
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
add conflictor/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) cf879ab] git-annex in .t/tmprepo53
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/subfile
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo53
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 3e2e76b] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 90c78f9..c15d702
Fast-forward
 conflictor => conflictor.variant-cc12 | 0
 conflictor/subfile                    | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-cc12 (100%)
 create mode 100644 conflictor/subfile
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo53
   bce1b62..3e2e76b  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating bce1b62..3e2e76b
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 28b33ef..e88654b
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo52
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
[adjusted/master(unlocked) 261799d] empty
adjust ok
[adjusted/master(unlocked) 261799d] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 18b3b74] git-annex in .t/tmprepo54
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
add conflictor/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 4322ee4] git-annex in .t/tmprepo55
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/subfile
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo54
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
(Merging into master...) Adding conflictor/subfile
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 151ab72] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating ce36939..c86a61d
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo54
   1d6e3fc..151ab72  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 1d6e3fc..151ab72
Fast-forward
 conflictor => conflictor.variant-cc12 | 0
 conflictor/subfile                    | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-cc12 (100%)
 create mode 120000 conflictor/subfile
(Merging into adjusted branch...) 
Updating 6916823..533cf1b
Fast-forward
 conflictor => conflictor.variant-cc12 | 0
 conflictor/subfile                    | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-cc12 (100%)
 create mode 100644 conflictor/subfile
ok
pull r2 
From ../../.t/tmprepo55
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (4.72s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         [adjusted/master(unlocked) 9603de7] empty
adjust ok
[adjusted/master(unlocked) 9603de7] empty
adjust ok
add conflictor 

100%  7 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 05e9d9e] git-annex in .t/tmprepo56
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
On branch adjusted/master(unlocked)
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo56
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
Updating b7efb9d..8b59d9c
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
Updating 9603de7..f2df876
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Already up to date.
Updating 9603de7..f2df876
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo56
   8b59d9c..7eeea17  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
[adjusted/master(unlocked) 543cd8b] empty
adjust ok
[adjusted/master(unlocked) 0b9bb1e] empty
adjust ok
add conflictor/file 

100%  7 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6d406e9] git-annex in .t/tmprepo58
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/file
ok
On branch adjusted/master(unlocked)
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo58
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
Merge made by the 'recursive' strategy.
 conflictor/file | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/file
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 0b9bb1e..fdb5800
Already up to date.
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 0b9bb1e..fdb5800
To ../../.t/tmprepo58
   d9fda67..968e0d7  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
OK (2.73s)
    conflict resolution (removed file):                   [adjusted/master(unlocked) 2446568] empty
adjust ok
[adjusted/master(unlocked) 2446568] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6f4862d] git-annex in .t/tmprepo60
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo60
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
(Merging into master...) Updating cb53d88..cbdf1fe
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
(Merging into adjusted branch...) 
Updating 2446568..de4f94b
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo60
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 83c9027] git-annex in .t/tmprepo60
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo61
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
ok
(merging r2/git-annex into git-annex...)
push r2 
To ../../.t/tmprepo61
   cbdf1fe..cdbcf91  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[adjusted/master(unlocked) e020607] git-annex in .t/tmprepo61
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
merge synced/master (Merging into master...) CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 6302506] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating e020607..8cd1659
Fast-forward
 conflictor => conflictor.variant-0cbf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conflictor => conflictor.variant-0cbf (100%)
ok
pull r1 
From ../../.t/tmprepo60
 + b25f606...e7a5136 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   4caf25e..5b097b3  git-annex                 -> r1/git-annex
   cbdf1fe..cdbcf91  master                    -> r1/master
   cbdf1fe..cdbcf91  synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo60
   4caf25e..57a266e  git-annex -> synced/git-annex
   cdbcf91..6302506  master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating cdbcf91..6302506
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-0cbf
(Merging into adjusted branch...) 
Updating e7a5136..0293d8a
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo61
 + b25f606...f16676c adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   5b097b3..57a266e  git-annex                 -> r2/git-annex
   cdbcf91..6302506  master                    -> r2/master
   cdbcf91..6302506  synced/master             -> r2/synced/master
ok
[adjusted/master(unlocked) 40e1841] empty
adjust ok
[adjusted/master(unlocked) 40e1841] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) dc7d54d] git-annex in .t/tmprepo62
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo62
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
(Merging into master...) Updating 124a7bb..a2b599e
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
(Merging into adjusted branch...) 
Updating 40e1841..42a4b14
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo62
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[adjusted/master(unlocked) 29d61ba] git-annex in .t/tmprepo63
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo62
   0d9243c..fb8cc75  git-annex -> synced/git-annex
   a2b599e..e2a8534  master -> synced/master
ok
commit 
[adjusted/master(unlocked) 544cbd6] git-annex in .t/tmprepo62
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
merge synced/master (Merging into master...) CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 92bab79] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 544cbd6..5c90811
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo63
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
ok
push r2 
To ../../.t/tmprepo63
   e2a8534..92bab79  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating e2a8534..92bab79
Fast-forward
 conflictor => conflictor.variant-0cbf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conflictor => conflictor.variant-0cbf (100%)
(Merging into adjusted branch...) 
Updating ea059c5..9cbd923
Fast-forward
 conflictor => conflictor.variant-0cbf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conflictor => conflictor.variant-0cbf (100%)
ok
pull r1 
From ../../.t/tmprepo62
 + f0c3d5a...ae271fe adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   e2a8534..92bab79  master                    -> r1/master
   e2a8534..92bab79  synced/master             -> r1/synced/master
ok
OK (4.94s)
    conflict resolution (nonannexed file):                [adjusted/master(unlocked) b327195] empty
adjust ok
[adjusted/master(unlocked) b327195] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 3302c60] git-annex in .t/tmprepo64
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 42fe850] git-annex in .t/tmprepo65
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo65
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD f5ce65e] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 3e30ac0..4411da6
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 conflictor.variant-cc12
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo65
   8833c01..f5ce65e  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 8833c01..f5ce65e
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 2f84f8c..9b3f864
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo64
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
[adjusted/master(unlocked) cfb177d] empty
adjust ok
[adjusted/master(unlocked) cfb177d] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 849f600] git-annex in .t/tmprepo66
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 9424431] git-annex in .t/tmprepo67
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo66
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 61b8e70] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 4c91b8e..b20f30b
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo66
   3e74ae4..61b8e70  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 3e74ae4..61b8e70
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 conflictor
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 26b4ff9..b16a10a
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo67
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
ok
OK (3.99s)
    conflict resolution (nonannexed symlink):             [adjusted/master(unlocked) bf36a3d] empty
adjust ok
[adjusted/master(unlocked) bf36a3d] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) ed6093c] git-annex in .t/tmprepo68
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) d9b2216] git-annex in .t/tmprepo69
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo69
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD fa2a39a] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 57e97a8..4e35253
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 120000 conflictor
 create mode 100644 conflictor.variant-cc12
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo69
   6a40210..fa2a39a  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 6a40210..fa2a39a
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 2646824..e241892
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo68
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
[adjusted/master(unlocked) 6ec7aed] empty
adjust ok
[adjusted/master(unlocked) ac8a863] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 56a0135] git-annex in .t/tmprepo70
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 10d3abd] git-annex in .t/tmprepo71
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo70
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
(Merging into master...) CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[detached HEAD 270c268] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating d36538a..04eb41f
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo70
   e9325a0..270c268  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating e9325a0..270c268
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 7b57e36..3eea34d
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 120000 conflictor
 create mode 100644 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo71
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
ok
OK (3.79s)
    conflict resolution (mixed locked and unlocked file): [adjusted/master(unlocked) 920bb1c] empty
adjust ok
[adjusted/master(unlocked) 64c8b5d] empty
adjust ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 0dd487f] git-annex in .t/tmprepo72
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 2fd2b46] git-annex in .t/tmprepo73
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo73
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
(Merging into master...) Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 550428d..3146a44
Fast-forward
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo73
   2e7f06b..e8423e6  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 2e7f06b..e8423e6
Fast-forward
(Merging into adjusted branch...) 
Updating b2cd02e..480b096
Fast-forward
ok
pull r1 
From ../../.t/tmprepo72
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo73
 + b2cd02e...1546cd2 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
OK (2.00s)
    map:                                                  [adjusted/master(unlocked) 16ec9d4] empty
adjust ok
describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
map . ok
map ../main0 ok
  left map in .git/annex/map.dot
OK (0.39s)
    uninit:                                               [adjusted/master(unlocked) 11b1466] empty
adjust ok
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was bcbcd65).
OK (0.54s)
    uninit (in git-annex branch):                         [adjusted/master(unlocked) 11b1466] empty
adjust ok
Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.40s)
    upgrade:                                              [adjusted/master(unlocked) 2e0169f] empty
adjust ok
upgrade ok
OK (0.29s)
    whereis:                                              [adjusted/master(unlocked) 2e0169f] empty
adjust ok
whereis foo (1 copy) 
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
whereis foo (1 copy) 
  	850dd7b0-eaf5-4a8b-bd02-36e269dd0143 -- .t/tmprepo78 [here]
  The following untrusted locations may also have copies:
  	a7a9e74c-e389-4bab-8a7a-16aa4488eca7 -- test repo [origin]
ok
OK (0.62s)
    hook remote:                                          [adjusted/master(unlocked) 2606e72] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 


ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 


(checksum...) 
ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.87s)
    directory remote:                                     [adjusted/master(unlocked) 2606e72] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (to foo...) 

100%  20 B             50 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             42 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.83s)
    rsync remote:                                         [adjusted/master(unlocked) c836ac0] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 
sending incremental file list
6cd/
6cd/e82/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/5)
ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (1.07s)
    bup remote:                                           [adjusted/master(unlocked) f54212e] empty
adjust ok
OK (0.27s)
    crypto:                                               [adjusted/master(unlocked) 4e3fcd0] empty
adjust ok
[adjusted/master(unlocked) 4e3fcd0] empty
adjust ok
[adjusted/master(unlocked) 4e3fcd0] empty
adjust ok
OK (0.81s)
    preferred content:                                    [adjusted/master(unlocked) 4e3fcd0] empty
adjust ok
wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
drop foo ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (1.59s)
    add subdirs:                                          [adjusted/master(unlocked) 4cdd8b8] empty
adjust ok
add dir/foo 

100%  24 B             12 KiB/s 0s
                                  
ok
(recording state in git...)
add ../dir2/foo 

100%  20 B             12 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.73s)
    addurl:                                               [adjusted/master(unlocked) d75ae7f] empty
adjust ok
  Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo88/myurl
  Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo88/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo88/myurl 


(to _builddir_build_BUILD_git_annex_8.20200330_test_.t_tmprepo88_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo88/myurl 


(to addurlurldest) ok
(recording state in git...)
OK (0.58s)
  Unit Tests v8 unlocked
    add dup:                                              Init Tests
  init: init test repo (scanning for unlocked files...)
ok
(recording state in git...)
OK (0.10s)
  add:  add sha1foo 

100%  25 B            217 KiB/s 0s
                                  
ok
(recording state in git...)
unlock sha1foo ok
(recording state in git...)
OK (0.36s)
All 2 tests passed (0.46s)
git-annex: git status will show ./foo to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh ./foo
OK (0.29s)
    add extras:                                           add apple 


ok
(recording state in git...)
unlock apple ok
(recording state in git...)
OK (0.43s)
    export_import:                                        initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
export foo bar.c ok
export foo foo ok
export foo sha1foo ok
(recording state in git...)
list foo ok
import foo import 

100%  16 B            100 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating f1ee689..0542e26
Fast-forward
 bar.c   | 2 +-
 foo     | 2 +-
 import  | 1 +
 sha1foo | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100644 => 120000 bar.c
 mode change 100644 => 120000 foo
 create mode 120000 import
 mode change 100644 => 120000 sha1foo
ok
add import 

100%  23 B             13 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 1f01c10] git-annex in .t/tmprepo91
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
unexport foo import ok
export foo import ok
(recording state in git...)
add import 

100%  23 B             15 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 1092f0d] git-annex in .t/tmprepo91
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
  unsafe to overwrite file
git-annex: export: 2 failed
list foo ok
import foo import 

100%  23 B            148 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
Auto-merging import
CONFLICT (content): Merge conflict in import
Automatic merge failed; fix conflicts and then commit the result.
add import 

100%  23 B             15 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master 9953aaa] git-annex in .t/tmprepo91
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (1.57s)
    export_import_subdir:                                 initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
[master 5a7de8e] moved
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename foo => subdir/foo (100%)
commit 
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
ok
list foo ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Merge made by the 'recursive' strategy.
ok
export foo foo ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating 1d7dc39..1d75e79
Fast-forward
 subdir/foo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 120000 subdir/foo
ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
merge foo/master 
Updating 1d75e79..0e1bab2
Fast-forward
ok
(recording state in git...)
OK (1.20s)
    shared clone:                                         OK (0.19s)
    log:                                                  + Tue, 31 Mar 2020 20:02:46 UTC foo | baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
OK (0.25s)
    import:                                               import import1/f ok
(recording state in git...)
import import2/f ok
(recording state in git...)
import import3/f (duplicate; skipping) ok
import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import5/f ok
(recording state in git...)
drop import1/f ok
(recording state in git...)
  Could not verify that the content is still present in the annex; not removing from the import location.
git-annex: import: 1 failed
OK (0.77s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.43s)
    unannex (no copy):                                    OK (0.26s)
    unannex (with copy):                                  get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
OK (0.43s)
    drop (no remote):                                     get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
drop foo ok
(recording state in git...)
OK (0.46s)
    drop (with remote):                                   get foo (from origin...) 


(checksum...) ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
git-annex: drop: 1 failed
numcopies 1 ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.65s)
    drop (untrusted remote):                              untrust origin ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.46s)
    get:                                                  get foo (from origin...) 


(checksum...) ok
(recording state in git...)
OK (0.47s)
    get (ssh remote):                                     get foo (from origin...) 

100%  20 B              840 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.42s)
    move:                                                 move foo (from origin...) 


(checksum...) (recording state in git...)
ok
(recording state in git...)
move foo (to origin...) 


(checksum...) (recording state in git...)
ok
(recording state in git...)
OK (0.87s)
    move (ssh remote):                                    move foo (from origin...) 

100%  20 B              869 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
move foo (to origin...) 

100%  20 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.97s)
    copy:                                                 copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.77s)
    lock:                                                 add newfile 

100%  3 B               583 B/s 0s
                                  
ok
(recording state in git...)
unlock newfile ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo ok
(recording state in git...)
unlock foo ok
(recording state in git...)
drop foo (unsafe) 
  Could only verify the existence of 0 out of 1 necessary copies
  Rather than dropping this file, try using: git annex move
  (Use --force to override this check, or adjust numcopies.)
failed
(recording state in git...)
git-annex: drop: 1 failed
OK (1.08s)
    lock --force:                                         upgrade ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo (checksum...) ok
(recording state in git...)
OK (0.47s)
    edit (no pre-commit):                                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.52s)
    edit (pre-commit):                                    get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.50s)
    partial commit:                                       get foo (from origin...) 


(checksum...) ok
(recording state in git...)
(recording state in git...)
OK (0.52s)
    fix:                                                  OK (0.19s)
    trust:                                                trust origin ok
(recording state in git...)
trust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
OK (0.64s)
    fsck (basics):                                        fsck foo ok
fsck sha1foo ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
git-annex: fsck: 2 failed
numcopies 1 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.81s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.14s)
    fsck (local untrusted):                               get foo (from origin...) 


(checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	8df53455-f380-46a0-a797-765f9764b1d7 -- .t/tmprepo116 [here]
   	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
git-annex: fsck: 2 failed
trust . ok
(recording state in git...)
fsck foo (checksum...) ok
(recording state in git...)
OK (0.55s)
    fsck (remote untrusted):                              numcopies 2 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.64s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.26s)
    migrate:                                              get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
OK (0.87s)
    migrate (via gitattributes):                          get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) ok
(recording state in git...)
migrate foo (checksum...) ok
(recording state in git...)
OK (0.88s)
    unused:                                               unused . (checking for unused data...) ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) ok
commit 
[master b6f809b] git-annex in .t/tmprepo121
 1 file changed, 1 deletion(-)
 delete mode 100644 foo
ok
unused . (checking for unused data...) (checking origin/HEAD...) (checking master...) ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
commit 
[master c006abb] git-annex in .t/tmprepo121
 1 file changed, 1 deletion(-)
 delete mode 100644 sha1foo
ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
(recording state in git...)
unused . (checking for unused data...) ok
(recording state in git...)
unused . (checking for unused data...) ok
OK (1.76s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.27s)
    find:                                                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
add dir/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.76s)
    merge:                                                merge git-annex ok
OK (0.22s)
    info:                                                 OK (0.23s)
    version:                                              git-annex version: 8.20200330
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite
dependency versions: aws-0.21.1 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.4 feed-1.1.0.0 ghc-8.6.5 http-client-0.6.4 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0.1
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external
operating system: linux x86_64
supported repository versions: 8
upgrade supported from repository versions: 0 1 2 3 4 5 6 7
local repository version: 8
OK (0.21s)
    sync:                                                 commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main1
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
wanted . ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main1
   14dacda..b8b28f6  git-annex -> synced/git-annex
ok
drop foo ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main1
   b8b28f6..05dff81  git-annex -> synced/git-annex
ok
OK (1.25s)
    concurrent get of dup key regression:                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
get foo2 (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.75s)
    union merge regression:                               get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo130
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
pull r1 
From ../../.t/tmprepo129
 * [new branch]      git-annex  -> r1/git-annex
 * [new branch]      master     -> r1/master
ok
(merging r1/git-annex r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo130
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo129
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo131
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r1 
From ../../.t/tmprepo129
 * [new branch]      git-annex        -> r1/git-annex
 * [new branch]      master           -> r1/master
 * [new branch]      synced/git-annex -> r1/synced/git-annex
 * [new branch]      synced/master    -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo131
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r2 
From ../../.t/tmprepo130
 * [new branch]      git-annex        -> r2/git-annex
 * [new branch]      master           -> r2/master
 * [new branch]      synced/git-annex -> r2/synced/git-annex
 * [new branch]      synced/master    -> r2/synced/master
ok
drop foo ok
(recording state in git...)
drop foo ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo131
   4b16f86..4ec8bdc  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo130
   4b16f86..985102a  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo131
 * [new branch]      git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo130
   4b16f86..d57dbf7  git-annex -> synced/git-annex
ok
OK (2.25s)
    adjusted branch merge regression:                     upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 2807e23] git-annex in .t/tmprepo132
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo133
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo133
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) bcf693f] git-annex in .t/tmprepo133
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
merge synced/master (Merging into master...) Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating bcf693f..9823968
Fast-forward
ok
pull r1 
From ../../.t/tmprepo132
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo132
   99a720e..e5ad66b  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 99a720e..e5ad66b
Fast-forward
(Merging into adjusted branch...) 
Updating 73a4f70..84b6047
Fast-forward
ok
pull r2 
From ../../.t/tmprepo133
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   4d22454..58a8daa  git-annex                 -> r2/git-annex
   f1ee689..e5ad66b  master                    -> r2/master
   99a720e..e5ad66b  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo132
 + 73a4f70...1f79acf adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (1.98s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

100%  3 B               700 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 9e8b355] git-annex in .t/tmprepo134
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/c/d
ok
add a/b/x/y 

100%  3 B               710 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f8ee1bd] git-annex in .t/tmprepo134
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (0.83s)
    conflict resolution:                                  commit (recording state in git...)
[master bbcdeca] git-annex in .t/tmprepo135
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master c90633b] git-annex in .t/tmprepo136
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo136
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master d2a863a] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo136
   c90633b..d2a863a  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating c90633b..d2a863a
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo135
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo136
   c90633b..d2a863a  master     -> r2/master
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (1.91s)
    conflict resolution (adjusted branch):                commit (recording state in git...)
[master 7249983] git-annex in .t/tmprepo137
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master 292b013] git-annex in .t/tmprepo138
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo138
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 08767ae] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo138
   292b013..08767ae  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 292b013..08767ae
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
(Merging into adjusted branch...) 
Updating 08f2fb5..11d1f89
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo137
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo138
 + 08f2fb5...d6dd29b adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (1.98s)
    conflict resolution movein regression:                get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[master ac5f642] git-annex in .t/tmprepo139
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r2 
From ../../.t/tmprepo140
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo140
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[master d7fbc92] git-annex in .t/tmprepo140
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
merge synced/master 
Auto-merging foo
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master f7a0709] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo139
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo139
   ac5f642..f7a0709  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating ac5f642..f7a0709
Fast-forward
 foo => foo.variant-0b0e | 0
 foo.variant-bc25        | 1 +
 2 files changed, 1 insertion(+)
 rename foo => foo.variant-0b0e (100%)
 create mode 100644 foo.variant-bc25
ok
pull r2 
From ../../.t/tmprepo140
   f81a0b2..26240a8  git-annex     -> r2/git-annex
   f1ee689..f7a0709  master        -> r2/master
   ac5f642..f7a0709  synced/master -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 


(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 


(checksum...) ok
(recording state in git...)
OK (2.00s)
    conflict resolution (mixed directory and file):       commit (recording state in git...)
[master 2f6dd94] git-annex in .t/tmprepo141
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master 582cc27] git-annex in .t/tmprepo142
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/subfile
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo142
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master a0841c2] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo142
   582cc27..a0841c2  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 582cc27..a0841c2
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo141
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
commit (recording state in git...)
[master d8169b8] git-annex in .t/tmprepo143
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master cd1fe62] git-annex in .t/tmprepo144
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/subfile
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo143
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Adding conflictor/subfile
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 25e4d00] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo143
   d8169b8..25e4d00  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating d8169b8..25e4d00
Fast-forward
 conflictor => conflictor.variant-cc12 | 0
 conflictor/subfile                    | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-cc12 (100%)
 create mode 100644 conflictor/subfile
ok
pull r2 
From ../../.t/tmprepo144
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (3.64s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         commit (recording state in git...)
[master 4bf521c] git-annex in .t/tmprepo145
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo145
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f1ee689..4bf521c
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating f1ee689..4bf521c
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo145
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo145'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
To ../../.t/tmprepo145
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo145'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  Pushing to r1 failed.
git-annex: sync: 2 failed
commit (recording state in git...)
[master 93e6d6d] git-annex in .t/tmprepo147
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/file
ok
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo147
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f1ee689..93e6d6d
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating f1ee689..93e6d6d
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo147
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo147'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
To ../../.t/tmprepo147
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo147'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  Pushing to r1 failed.
git-annex: sync: 2 failed
OK (2.03s)
    conflict resolution (removed file):                   commit (recording state in git...)
[master 63527bc] git-annex in .t/tmprepo149
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo149
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f1ee689..63527bc
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo149
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
commit 
[master 8a485f7] git-annex in .t/tmprepo149
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo150
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
(merging r2/git-annex into git-annex...)
push r2 
To ../../.t/tmprepo150
   63527bc..8a485f7  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master 2ce173b] git-annex in .t/tmprepo150
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
merge synced/master 
CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master c39fc81] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo149
   da6d139..ea5905e  git-annex     -> r1/git-annex
   63527bc..8a485f7  master        -> r1/master
   63527bc..8a485f7  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo149
   da6d139..b7c5069  git-annex -> synced/git-annex
   8a485f7..c39fc81  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 8a485f7..c39fc81
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo150
   ea5905e..b7c5069  git-annex     -> r2/git-annex
   63527bc..c39fc81  master        -> r2/master
   8a485f7..c39fc81  synced/master -> r2/synced/master
ok
commit (recording state in git...)
[master b714bb9] git-annex in .t/tmprepo151
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo151
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f1ee689..b714bb9
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo151
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[master 06f2e63] git-annex in .t/tmprepo152
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo151
   e146cf7..782671f  git-annex -> synced/git-annex
   b714bb9..06f2e63  master -> synced/master
ok
commit 
[master 3b1968f] git-annex in .t/tmprepo151
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
merge synced/master 
CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master dbaa60d] git-annex automatic merge conflict fix
ok
pull r2 
From ../../.t/tmprepo152
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
push r2 
To ../../.t/tmprepo152
   06f2e63..dbaa60d  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 06f2e63..dbaa60d
Fast-forward
 conflictor => conflictor.variant-0cbf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conflictor => conflictor.variant-0cbf (100%)
ok
pull r1 
From ../../.t/tmprepo151
   b714bb9..dbaa60d  master        -> r1/master
   06f2e63..dbaa60d  synced/master -> r1/synced/master
ok
OK (3.94s)
    conflict resolution (nonannexed file):                commit (recording state in git...)
[master 4d00950] git-annex in .t/tmprepo153
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master ea3862d] git-annex in .t/tmprepo154
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo154
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 0f90714] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo154
   ea3862d..0f90714  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating ea3862d..0f90714
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo153
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit (recording state in git...)
[master 05ae02a] git-annex in .t/tmprepo155
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 52937bb] git-annex in .t/tmprepo156
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo155
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 735bfe5] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo155
   05ae02a..735bfe5  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 05ae02a..735bfe5
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo156
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (3.35s)
    conflict resolution (nonannexed symlink):             commit (recording state in git...)
[master 252df53] git-annex in .t/tmprepo157
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master c2b7268] git-annex in .t/tmprepo158
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo158
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 92e705a] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo158
   c2b7268..92e705a  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating c2b7268..92e705a
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo157
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit (recording state in git...)
[master f5c9d63] git-annex in .t/tmprepo159
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master ba80302] git-annex in .t/tmprepo160
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo159
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master cced359] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo159
   f5c9d63..cced359  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating f5c9d63..cced359
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 120000 conflictor
 create mode 100644 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo160
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.48s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master d7521c2] git-annex in .t/tmprepo161
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master 48f893c] git-annex in .t/tmprepo162
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo162
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor
[master a22d4cf] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo162
   48f893c..a22d4cf  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 48f893c..a22d4cf
Fast-forward
ok
pull r1 
From ../../.t/tmprepo161
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo162
   48f893c..a22d4cf  master     -> r2/master
ok
OK (1.72s)
    map:                                                  describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
map . ok
map ../main1 ok
  left map in .git/annex/map.dot
OK (0.31s)
    uninit:                                               get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was 016afd2).
OK (0.45s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.33s)
    upgrade:                                              upgrade ok
OK (0.21s)
    whereis:                                              whereis foo (1 copy) 
  	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
whereis foo (1 copy) 
  	2af91f83-ff6d-42c8-b587-52a28399b43b -- .t/tmprepo167 [here]
  The following untrusted locations may also have copies:
  	baffb58e-75d8-48b4-be00-57b5dc6c3dc9 -- test repo [origin]
ok
OK (0.53s)
    hook remote:                                          initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 


ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 


(checksum...) 
ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.81s)
    directory remote:                                     initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (to foo...) 

100%  20 B             59 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             51 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.80s)
    rsync remote:                                         initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 
sending incremental file list
6cd/
6cd/e82/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/5)
ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (1.04s)
    bup remote:                                           OK (0.20s)
    crypto:                                               OK (0.59s)
    preferred content:                                    wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
drop foo ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (1.40s)
    add subdirs:                                          add dir/foo 

100%  24 B             15 KiB/s 0s
                                  
ok
(recording state in git...)
add ../dir2/foo 

100%  20 B             12 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.57s)
    addurl:                                                 Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo177/myurl
  Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo177/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo177/myurl 


(to _builddir_build_BUILD_git_annex_8.20200330_test_.t_tmprepo177_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo177/myurl 


(to addurlurldest) ok
(recording state in git...)
OK (0.33s)
  Unit Tests v8 locked
Init Tests
    add dup:                                                init: init test repo (scanning for unlocked files...)
ok
(recording state in git...)
OK (0.09s)
  add:  add foo 

100%  20 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
add sha1foo 

100%  25 B            164 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.26s)
All 2 tests passed (0.35s)
add foodup 

100%  20 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.29s)
    add extras:                                           add apple 


ok
(recording state in git...)
OK (0.24s)
    export_import:                                        initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
export foo bar.c ok
export foo foo ok
export foo sha1foo ok
(recording state in git...)
list foo ok
import foo import 

100%  16 B            105 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating 4ca9339..d8f1ee5
Fast-forward
 bar.c  | 2 +-
 import | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 120000 bar.c
 create mode 120000 import
ok
add import 

100%  23 B             14 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master bdfbea5] git-annex in .t/tmprepo180
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
unexport foo import ok
export foo import ok
(recording state in git...)
add import 

100%  23 B             14 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master bd62da4] git-annex in .t/tmprepo180
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
  unsafe to overwrite file
git-annex: export: 2 failed
list foo ok
import foo import 

100%  23 B            113 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
Auto-merging import
CONFLICT (content): Merge conflict in import
Automatic merge failed; fix conflicts and then commit the result.
add import 

100%  23 B             14 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master a747fb9] git-annex in .t/tmprepo180
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (1.57s)
    export_import_subdir:                                 initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fix subdir/foo ok
(recording state in git...)
[master 26ba4df] moved
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 120000 foo
 create mode 120000 subdir/foo
commit 
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean
ok
list foo ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Merge made by the 'recursive' strategy.
ok
export foo foo ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
merge foo/master 
Already up to date.
ok
(recording state in git...)
list foo ok
update refs/remotes/foo/master ok
merge foo/master 
Updating 75367c5..d3a3603
Fast-forward
ok
(recording state in git...)
OK (1.02s)
    shared clone:                                         OK (0.17s)
    log:                                                  + Tue, 31 Mar 2020 20:03:47 UTC foo | d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
OK (0.20s)
    import:                                               import import1/f ok
(recording state in git...)
import import2/f ok
(recording state in git...)
import import3/f (duplicate; skipping) ok
import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok
import import5/f ok
(recording state in git...)
drop import1/f ok
(recording state in git...)
  Could not verify that the content is still present in the annex; not removing from the import location.
git-annex: import: 1 failed
OK (0.67s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.33s)
    unannex (no copy):                                    OK (0.21s)
    unannex (with copy):                                  get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
OK (0.32s)
    drop (no remote):                                     get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
drop foo ok
(recording state in git...)
OK (0.41s)
    drop (with remote):                                   get foo (from origin...) 


(checksum...) ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
git-annex: drop: 1 failed
numcopies 1 ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.48s)
    drop (untrusted remote):                              untrust origin ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.37s)
    get:                                                  get foo (from origin...) 


(checksum...) ok
(recording state in git...)
OK (0.39s)
    get (ssh remote):                                     get foo (from origin...) 

100%  20 B              1 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.38s)
    move:                                                 move foo (from origin...) 


(checksum...) ok
(recording state in git...)
move foo (to origin...) 


(checksum...) ok
(recording state in git...)
OK (0.62s)
    move (ssh remote):                                    move foo (from origin...) 

100%  20 B              1 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
move foo (to origin...) 

100%  20 B              9 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.74s)
    copy:                                                 copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.60s)
    lock:                                                 add newfile 

100%  3 B               583 B/s 0s
                                  
ok
(recording state in git...)
unlock newfile ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo ok
(recording state in git...)
unlock foo ok
(recording state in git...)
drop foo (unsafe) 
  Could only verify the existence of 0 out of 1 necessary copies
  Rather than dropping this file, try using: git annex move
  (Use --force to override this check, or adjust numcopies.)
failed
(recording state in git...)
git-annex: drop: 1 failed
OK (0.68s)
    lock --force:                                         upgrade ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override)
git-annex: lock: 1 failed
lock foo (checksum...) ok
(recording state in git...)
OK (0.41s)
    edit (no pre-commit):                                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.45s)
    edit (pre-commit):                                    get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.44s)
    partial commit:                                       get foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
(recording state in git...)
OK (0.47s)
    fix:                                                  get foo (from origin...) 


(checksum...) ok
(recording state in git...)
fix s/foo ok
(recording state in git...)
OK (0.38s)
    trust:                                                trust origin ok
(recording state in git...)
trust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
dead origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
semitrust origin ok
(recording state in git...)
OK (0.62s)
    fsck (basics):                                        fsck foo ok
fsck sha1foo ok
(recording state in git...)
numcopies 2 ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
git-annex: fsck: 2 failed
numcopies 1 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
  foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
git-annex: fsck: 1 failed
fsck foo ok
fsck sha1foo ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
  sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
git-annex: fsck: 1 failed
fsck foo ok
fsck sha1foo ok
(recording state in git...)
OK (0.76s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.14s)
    fsck (local untrusted):                               get foo (from origin...) 


(checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
   	d9a86734-074e-4900-8398-d6a20d6d5f72 -- .t/tmprepo205 [here]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
git-annex: fsck: 2 failed
trust . ok
(recording state in git...)
fsck foo (checksum...) ok
(recording state in git...)
OK (0.49s)
    fsck (remote untrusted):                              numcopies 2 ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
untrust origin ok
(recording state in git...)
  Only 1 of 2 trustworthy copies exist of foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
  Only 1 of 2 trustworthy copies exist of sha1foo
  Back it up with git-annex copy.
  The following untrusted locations may also have copies: 
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.50s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.24s)
    migrate:                                              get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) (checksum...) ok
(recording state in git...)
migrate foo (checksum...) (checksum...) ok
(recording state in git...)
OK (0.70s)
    migrate (via gitattributes):                          get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
migrate foo (checksum...) (checksum...) ok
(recording state in git...)
migrate sha1foo (checksum...) (checksum...) ok
(recording state in git...)
migrate foo (checksum...) (checksum...) ok
(recording state in git...)
OK (0.67s)
    unused:                                               unused . (checking for unused data...) ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) ok
commit 
[master 010b11e] git-annex in .t/tmprepo210
 1 file changed, 1 deletion(-)
 delete mode 120000 foo
ok
unused . (checking for unused data...) (checking origin/HEAD...) (checking master...) ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
commit 
[master 09fbc40] git-annex in .t/tmprepo210
 1 file changed, 1 deletion(-)
 delete mode 120000 sha1foo
ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
add unusedfile 

100%  13 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
add unusedfile 

100%  13 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
OK (1.25s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.26s)
    find:                                                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
add dir/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.63s)
    merge:                                                merge git-annex ok
OK (0.21s)
    info:                                                 OK (0.20s)
    version:                                              git-annex version: 8.20200330
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite
dependency versions: aws-0.21.1 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.4 feed-1.1.0.0 ghc-8.6.5 http-client-0.6.4 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0.1
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external
operating system: linux x86_64
supported repository versions: 8
upgrade supported from repository versions: 0 1 2 3 4 5 6 7
local repository version: 8
OK (0.18s)
    sync:                                                 commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
wanted . ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   6cf7233..8702e4c  git-annex -> synced/git-annex
ok
drop foo ok
(recording state in git...)
commit 
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   8702e4c..89fd039  git-annex -> synced/git-annex
ok
OK (1.18s)
    concurrent get of dup key regression:                 get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (0.48s)
    union merge regression:                               get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo219
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
pull r1 
From ../../.t/tmprepo218
 * [new branch]      git-annex  -> r1/git-annex
 * [new branch]      master     -> r1/master
ok
(merging r1/git-annex r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo219
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo218
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo220
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r1 
From ../../.t/tmprepo218
 * [new branch]      git-annex        -> r1/git-annex
 * [new branch]      master           -> r1/master
 * [new branch]      synced/git-annex -> r1/synced/git-annex
 * [new branch]      synced/master    -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo220
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r2 
From ../../.t/tmprepo219
 * [new branch]      git-annex        -> r2/git-annex
 * [new branch]      master           -> r2/master
 * [new branch]      synced/git-annex -> r2/synced/git-annex
 * [new branch]      synced/master    -> r2/synced/master
ok
drop foo ok
(recording state in git...)
drop foo ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r3 
From ../../.t/tmprepo220
   6296cd5..6c27ce1  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo219
   6296cd5..ffcb5e6  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo220
 * [new branch]      git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo219
   6296cd5..825777e  git-annex -> synced/git-annex
ok
OK (2.06s)
    adjusted branch merge regression:                     upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) fb846cf] git-annex in .t/tmprepo221
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo222
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo222
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 67bfb62] git-annex in .t/tmprepo222
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
merge synced/master (Merging into master...) Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 67bfb62..2941661
Fast-forward
ok
pull r1 
From ../../.t/tmprepo221
 * [new branch]      adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r1/git-annex
 * [new branch]      master                    -> r1/master
 * [new branch]      synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo221
   00c7310..a890835  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 00c7310..a890835
Fast-forward
(Merging into adjusted branch...) 
Updating 0bd0840..78131bc
Fast-forward
ok
pull r2 
From ../../.t/tmprepo222
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   95f035e..5849305  git-annex                 -> r2/git-annex
   4ca9339..a890835  master                    -> r2/master
   00c7310..a890835  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo221
 + 0bd0840...ffa2be4 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (2.24s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

100%  3 B               720 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f5751de] git-annex in .t/tmprepo223
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/c/d
ok
add a/b/x/y 

100%  3 B               698 B/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6db8eb0] git-annex in .t/tmprepo223
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (0.89s)
    conflict resolution:                                  add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ecd4f81] git-annex in .t/tmprepo224
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master c4ee870] git-annex in .t/tmprepo225
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo225
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 16f8cf6] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo225
   c4ee870..16f8cf6  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating c4ee870..16f8cf6
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 120000 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo224
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo225
   c4ee870..16f8cf6  master     -> r2/master
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (1.45s)
    conflict resolution (adjusted branch):                add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ff6c3e1] git-annex in .t/tmprepo226
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor 

100%  11 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 7471fe7] git-annex in .t/tmprepo227
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo227
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
 * [new branch]      git-annex                 -> r2/git-annex
 * [new branch]      master                    -> r2/master
 * [new branch]      synced/master             -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 0886558] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo227
   7471fe7..0886558  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 7471fe7..0886558
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 120000 conflictor.variant-a507
(Merging into adjusted branch...) 
Updating 5815f09..07c9c02
Fast-forward
 conflictor => conflictor.variant-75dc | 0
 conflictor.variant-a507               | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-75dc (100%)
 create mode 100644 conflictor.variant-a507
ok
pull r1 
From ../../.t/tmprepo226
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo227
 + 5815f09...bd7d17f adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (1.88s)
    conflict resolution movein regression:                get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unlock foo ok
(recording state in git...)
unlock foo ok
(recording state in git...)
commit 
(recording state in git...)
[master 11d8a7a] git-annex in .t/tmprepo228
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite foo (100%)
 mode change 120000 => 100644
ok
pull r2 
From ../../.t/tmprepo229
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo229
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[master b2f2814] git-annex in .t/tmprepo229
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite foo (100%)
 mode change 120000 => 100644
ok
merge synced/master 
Auto-merging foo
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 605a3cd] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo228
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo228
   11d8a7a..605a3cd  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 11d8a7a..605a3cd
Fast-forward
 foo => foo.variant-0b0e | 0
 foo.variant-bc25        | 1 +
 2 files changed, 1 insertion(+)
 rename foo => foo.variant-0b0e (100%)
 create mode 100644 foo.variant-bc25
ok
pull r2 
From ../../.t/tmprepo229
   e19828d..3c45d01  git-annex     -> r2/git-annex
   4ca9339..605a3cd  master        -> r2/master
   11d8a7a..605a3cd  synced/master -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 


(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 


(checksum...) ok
(recording state in git...)
OK (1.81s)
    conflict resolution (mixed directory and file):       add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 7613cba] git-annex in .t/tmprepo230
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 0084e63] git-annex in .t/tmprepo231
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/subfile
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo231
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master c19c639] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo231
   0084e63..c19c639  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 0084e63..c19c639
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo230
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 46e9ab4] git-annex in .t/tmprepo232
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor/subfile 

100%  7 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master a299bd5] git-annex in .t/tmprepo233
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/subfile
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo232
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Adding conflictor/subfile
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 4217439] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo232
   46e9ab4..4217439  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 46e9ab4..4217439
Fast-forward
 conflictor => conflictor.variant-cc12 | 0
 conflictor/subfile                    | 1 +
 2 files changed, 1 insertion(+)
 rename conflictor => conflictor.variant-cc12 (100%)
 create mode 120000 conflictor/subfile
ok
pull r2 
From ../../.t/tmprepo233
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
get conflictor/subfile (from r2...) 


(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 


(checksum...) ok
(recording state in git...)
OK (2.63s)
    conflict resolution symlink bit:                      add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 71488f1] git-annex in .t/tmprepo234
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   89fd039..c7da161  git-annex -> synced/git-annex
   4ca9339..71488f1  master -> synced/master
ok
add conflictor/subfile 

100%  7 B               4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master a6dcecc] git-annex in .t/tmprepo235
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/subfile
ok
pull origin 
From /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   89fd039..c7da161  git-annex        -> origin/git-annex
   89fd039..c7da161  synced/git-annex -> origin/synced/git-annex
   4ca9339..71488f1  synced/master    -> origin/synced/master
Adding conflictor/subfile
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_synced_master
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 6ed3626] git-annex automatic merge conflict fix
ok
(merging origin/git-annex into git-annex...)
(recording state in git...)
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   c7da161..545b69b  git-annex -> synced/git-annex
   71488f1..6ed3626  master -> synced/master
ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master b161ab1] git-annex in .t/tmprepo236
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
pull origin 
From /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   89fd039..545b69b  git-annex        -> origin/git-annex
   89fd039..545b69b  synced/git-annex -> origin/synced/git-annex
   4ca9339..6ed3626  synced/master    -> origin/synced/master
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/synced/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master e1a973d] git-annex automatic merge conflict fix
ok
(merging origin/git-annex into git-annex...)
(recording state in git...)
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   545b69b..37c7f82  git-annex -> synced/git-annex
   6ed3626..e1a973d  master -> synced/master
ok
OK (1.63s)
    conflict resolution (uncommitted local file):         add conflictor 

100%  7 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master c54b956] git-annex in .t/tmprepo237
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo237
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 4ca9339..c54b956
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 4ca9339..c54b956
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo237
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo237'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
To ../../.t/tmprepo237
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo237'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  Pushing to r1 failed.
git-annex: sync: 2 failed
add conflictor/file 

100%  7 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 95ad0d0] git-annex in .t/tmprepo239
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/file
ok
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	conflictor
nothing added to commit but untracked files present (use "git add" to track)
From ../../.t/tmprepo239
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 4ca9339..95ad0d0
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 4ca9339..95ad0d0
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo239
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo239'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
To ../../.t/tmprepo239
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo239'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  Pushing to r1 failed.
git-annex: sync: 2 failed
OK (1.64s)
    conflict resolution (removed file):                   add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master cf3c090] git-annex in .t/tmprepo241
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo241
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 4ca9339..cf3c090
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo241
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master 677b2d3] git-annex in .t/tmprepo241
 1 file changed, 1 deletion(-)
 delete mode 120000 conflictor
ok
pull r2 
From ../../.t/tmprepo242
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
(merging r2/git-annex into git-annex...)
push r2 
To ../../.t/tmprepo242
   cf3c090..677b2d3  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master aa5959f] git-annex in .t/tmprepo242
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite conflictor (100%)
 mode change 120000 => 100644
ok
merge synced/master 
CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master a12a012] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo241
   1e9c80b..9f9ed36  git-annex     -> r1/git-annex
   cf3c090..677b2d3  master        -> r1/master
   cf3c090..677b2d3  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo241
   1e9c80b..4099ee9  git-annex -> synced/git-annex
   677b2d3..a12a012  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 677b2d3..a12a012
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo242
   9f9ed36..4099ee9  git-annex     -> r2/git-annex
   cf3c090..a12a012  master        -> r2/master
   677b2d3..a12a012  synced/master -> r2/synced/master
ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master f5016b8] git-annex in .t/tmprepo243
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo243
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 4ca9339..f5016b8
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo243
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 


(checksum...) ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
(recording state in git...)
[master c8521c7] git-annex in .t/tmprepo244
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite conflictor (100%)
 mode change 120000 => 100644
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo243
   443a87a..82a438f  git-annex -> synced/git-annex
   f5016b8..c8521c7  master -> synced/master
ok
commit 
[master 04eda16] git-annex in .t/tmprepo243
 1 file changed, 1 deletion(-)
 delete mode 120000 conflictor
ok
merge synced/master 
CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree.
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 49b85de] git-annex automatic merge conflict fix
ok
pull r2 
From ../../.t/tmprepo244
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
push r2 
To ../../.t/tmprepo244
   c8521c7..49b85de  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating c8521c7..49b85de
Fast-forward
 conflictor => conflictor.variant-0cbf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename conflictor => conflictor.variant-0cbf (100%)
ok
pull r1 
From ../../.t/tmprepo243
   f5016b8..49b85de  master        -> r1/master
   c8521c7..49b85de  synced/master -> r1/synced/master
ok
OK (3.37s)
    conflict resolution (nonannexed file):                add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 5e5c3f5] git-annex in .t/tmprepo245
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 137d58f] git-annex in .t/tmprepo246
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo246
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 045a1cb] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo246
   137d58f..045a1cb  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 137d58f..045a1cb
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo245
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ae159a2] git-annex in .t/tmprepo247
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 76f6a4f] git-annex in .t/tmprepo248
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo247
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master a2e421d] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo247
   ae159a2..a2e421d  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating ae159a2..a2e421d
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 conflictor
 create mode 120000 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo248
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.27s)
    conflict resolution (nonannexed symlink):             add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master eb015cb] git-annex in .t/tmprepo249
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master e539fb7] git-annex in .t/tmprepo250
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo250
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 43b7d06] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo250
   e539fb7..43b7d06  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating e539fb7..43b7d06
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo249
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master f873c86] git-annex in .t/tmprepo251
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 97466f9] git-annex in .t/tmprepo252
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo251
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Auto-merging conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
[master 379bee8] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r1/git-annex into git-annex...)
(recording state in git...)
push r1 
To ../../.t/tmprepo251
   f873c86..379bee8  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating f873c86..379bee8
Fast-forward
 conflictor              | 2 +-
 conflictor.variant-cc12 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 conflictor.variant-cc12
ok
pull r2 
From ../../.t/tmprepo252
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.15s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master c7f1703] git-annex in .t/tmprepo253
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor 

100%  10 B              2 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master f894e57] git-annex in .t/tmprepo254
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo254
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
(recording state in git...)
  Merge conflict was automatically resolved; you may want to examine the result.
git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor
[master 512c51d] git-annex automatic merge conflict fix
Already up to date.
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo254
   f894e57..512c51d  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating f894e57..512c51d
Fast-forward
ok
pull r1 
From ../../.t/tmprepo253
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo254
   f894e57..512c51d  master     -> r2/master
ok
OK (1.62s)
    map:                                                  describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
map . ok
map ../main2 ok
  left map in .git/annex/map.dot
OK (0.29s)
    uninit:                                               get foo (from origin...) 


(checksum...) ok
get sha1foo (from origin...) 


(checksum...) ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was b531c27).
OK (0.27s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.30s)
    upgrade:                                              upgrade ok
OK (0.18s)
    whereis:                                              whereis foo (1 copy) 
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
whereis foo (1 copy) 
  	794fecd6-f0c7-4f70-b748-7b8a1badb452 -- .t/tmprepo259 [here]
  The following untrusted locations may also have copies:
  	d5e8f368-df79-4038-8354-3d44ec0c5d9d -- test repo [origin]
ok
OK (0.41s)
    hook remote:                                          initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 


ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 


(checksum...) 
ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.63s)
    directory remote:                                     initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (to foo...) 

100%  20 B             70 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             47 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.60s)
    rsync remote:                                         initremote foo ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
copy foo (checking foo...) (to foo...) 
sending incremental file list
6cd/
6cd/e82/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/
6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/5)
ok
(recording state in git...)
drop foo (checking foo...) ok
(recording state in git...)
move foo (from foo...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.83s)
    bup remote:                                           OK (0.19s)
    crypto:                                               OK (0.51s)
    preferred content:                                    wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 


(checksum...) ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
drop foo ok
(recording state in git...)
ungroup . ok
(recording state in git...)
wanted . ok
(recording state in git...)
get foo (from origin...) 


(checksum...) ok
(recording state in git...)
drop foo ok
(recording state in git...)
OK (1.27s)
    add subdirs:                                          add dir/foo 

100%  24 B             15 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 00e1fd0] git-annex in .t/tmprepo268
 1 file changed, 1 insertion(+)
 create mode 120000 dir/foo
ok
pull origin 
Merge made by the 'recursive' strategy.
 conflictor.variant-cc12 | 1 +
 conflictor/subfile      | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 conflictor.variant-cc12
 create mode 120000 conflictor/subfile
ok
push origin 
To /builddir/build/BUILD/git-annex-8.20200330/test/.t/main2
   37c7f82..7803b8f  git-annex -> synced/git-annex
   e1a973d..69eaf8f  master -> synced/master
ok
add ../dir2/foo 

100%  20 B             12 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.68s)
    addurl:                                                 Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo269/myurl
  Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo269/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo269/myurl 


(to _builddir_build_BUILD_git_annex_8.20200330_test_.t_tmprepo269_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-8.20200330/test/.t/tmprepo269/myurl 


(to addurlurldest) ok
(recording state in git...)
OK (0.38s)
All 260 tests passed (196.58s)
+ popd
+ RPM_EC=0
~/build/BUILD/git-annex-8.20200330
++ jobs -p
+ exit 0
Processing files: git-annex-8.20200330-1.fc32.x86_64
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.l3XZKE
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex
+ cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex
+ cp -pr NEWS /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex
+ cp -pr README /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.1ZCErH
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex = 8.20200330-1.fc32 git-annex(x86-64) = 8.20200330-1.fc32
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.10)(64bit) libc.so.6(GLIBC_2.11)(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.2)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.6)(64bit) libc.so.6(GLIBC_2.7)(64bit) libc.so.6(GLIBC_2.8)(64bit) libdl.so.2()(64bit) libdl.so.2(GLIBC_2.2.5)(64bit) libffi.so.6()(64bit) libgmp.so.10()(64bit) libm.so.6()(64bit) libm.so.6(GLIBC_2.2.5)(64bit) libm.so.6(GLIBC_2.27)(64bit) libm.so.6(GLIBC_2.29)(64bit) libmagic.so.1()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.12)(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libpthread.so.0(GLIBC_2.3.2)(64bit) libsqlite3.so.0()(64bit) libz.so.1()(64bit) rtld(GNU_HASH)
Processing files: git-annex-docs-8.20200330-1.fc32.noarch
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.J3CzzH
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex-docs
+ export LC_ALL=C
+ LC_ALL=C
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex-docs
+ cp -pr html/ /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/doc/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.CGxAnF
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex-docs
+ export LC_ALL=C
+ LC_ALL=C
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex-docs
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64/usr/share/licenses/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex-docs = 8.20200330-1.fc32
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
Wrote: /builddir/build/RPMS/git-annex-docs-8.20200330-1.fc32.noarch.rpm
Wrote: /builddir/build/RPMS/git-annex-8.20200330-1.fc32.x86_64.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.t7QzlG
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-8.20200330
+ /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-8.20200330-1.fc32.x86_64
+ RPM_EC=0
++ jobs -p
+ exit 0
Child return code was: 0