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

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

100%  25 B            108 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.35s)
All 2 tests passed (0.52s)
[adjusted/master(unlocked) e63062a] empty
adjust ok
add foodup 

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


ok
(recording state in git...)
OK (0.52s)
    export_import:                                        [adjusted/master(unlocked) 4fab76c] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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             77 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master (Merging into master...) Updating 3e5a15b..674dc81
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 b6c58c3..5325a70
Fast-forward
 bar.c  | 2 +-
 import | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 import
ok
add import 

100%  23 B             16 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 7de21e7] 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             13 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 71740fd] 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             86 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             11 KiB/s 0s
                                  
ok
add import 

100%  23 B             66 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6e9744f] git-annex in .t/tmprepo2
ok
  unable to propigate merge commit Ref "6e9744f4f5973617664aca6240f1bffe72a20ca7" back to Ref "refs/heads/master"
unexport foo import ok
export foo import ok
(recording state in git...)
OK (3.03s)
    export_import_subdir:                                 [adjusted/master(unlocked) b9a7144] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00(checksum...) kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
[adjusted/master(unlocked) e1faab3] 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 4b191e9..595978c
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 29b9000..e7b11b3
Fast-forward
(Merging into adjusted branch...) 
Updating 369ea6f..d117b67
Fast-forward
ok
(recording state in git...)
OK (1.89s)
    shared clone:                                         [adjusted/master(unlocked) 5864466] empty
adjust ok
OK (0.34s)
    log:                                                  [adjusted/master(unlocked) 5864466] empty
adjust ok
+ Fri, 18 Oct 2019 08:27:05 UTC foo | 62a7150e-230b-4d55-95a5-5ce42441ab4e -- test repo [origin]
OK (0.31s)
    import:                                               [adjusted/master(unlocked) 2433dfb] 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.90s)
    reinject:                                             [adjusted/master(unlocked) 2433dfb] empty
adjust ok
reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.52s)
    unannex (no copy):                                    [adjusted/master(unlocked) ccf6427] empty
adjust ok
OK (0.35s)
    unannex (with copy):                                  [adjusted/master(unlocked) ccf6427] empty
adjust ok
get foo (from origin...) 
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...)
unannex foo ok
OK (0.49s)
    drop (no remote):                                     [adjusted/master(unlocked) 458dca1] empty
adjust ok
get foo (from origin...) 
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
drop foo ok
(recording state in git...)
OK (0.64s)
    drop (with remote):                                   [adjusted/master(unlocked) 458dca1] empty
adjust ok
get foo (from origin...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s   (checksum...)  0:00:00 (xfr#1, to-chk=0/1)
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.75s)
    drop (untrusted remote):                              [adjusted/master(unlocked) a235f99] empty
adjust ok
untrust origin ok
(recording state in git...)
get foo (from origin...) 
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.56s)
    get:                                                  [adjusted/master(unlocked) fa81ce5] empty
adjust ok
get foo (from origin...) 
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...)
OK (0.54s)
    get (ssh remote):                                     [adjusted/master(unlocked) fa81ce5] empty
adjust ok
get foo (from origin...) 

100%  20 B             1001 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.56s)
    move:                                                 [adjusted/master(unlocked) 75c2473] empty
adjust ok
move foo (from origin...) 
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...) (recording state in git...)
ok
(recording state in git...)
move foo (to origin...) 
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...) (recording state in git...)
ok
(recording state in git...)
OK (1.11s)
    move (ssh remote):                                    [adjusted/master(unlocked) 72cc147] empty
adjust ok
move foo (from origin...) 

100%  20 B              922 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.94s)
    copy:                                                 [adjusted/master(unlocked) 22c830a] empty
adjust ok
copy foo (from origin...) 
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...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.86s)
    lock:                                                 [adjusted/master(unlocked) f53214f] empty
adjust ok
add newfile 

100%  3 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
get foo (from origin...) 
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: 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.02s)
    lock --force:                                         [adjusted/master(unlocked) f0d29a5] empty
adjust ok
upgrade ok
get foo (from origin...) 
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: 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.51s)
    edit (no pre-commit):                                 [adjusted/master(unlocked) f0d29a5] empty
adjust ok
get foo (from origin...) 
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...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.61s)
    edit (pre-commit):                                    [adjusted/master(unlocked) 37bc729] empty
adjust ok
get foo (from origin...) 
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...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.66s)
    partial commit:                                       [adjusted/master(unlocked) 68c5d19] empty
adjust ok
get foo (from origin...) 
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...)
(recording state in git...)
OK (0.54s)
    fix:                                                  [adjusted/master(unlocked) 68c5d19] empty
adjust ok
OK (0.25s)
    trust:                                                [adjusted/master(unlocked) 68c5d19] 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.75s)
    fsck (basics):                                        [adjusted/master(unlocked) aa513cf] 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...) 
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...)
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...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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.96s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.15s)
    fsck (local untrusted):                               [adjusted/master(unlocked) ca1a7a1] empty
adjust ok
get foo (from origin...) 
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...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- test repo [origin]
   	f5f1dd2b-1739-4cd0-a8b9-a702caa5b9f2 -- .t/tmprepo27 [here]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- 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.63s)
    fsck (remote untrusted):                              [adjusted/master(unlocked) e51132d] empty
adjust ok
numcopies 2 ok
(recording state in git...)
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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: 
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- 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: 
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.71s)
    fsck --from remote:                                   [adjusted/master(unlocked) 2b2d58b] empty
adjust ok
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.36s)
    migrate:                                              [adjusted/master(unlocked) 2b2d58b] empty
adjust ok
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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 (1.26s)
    migrate (via gitattributes):                          [adjusted/master(unlocked) 4da6b98] empty
adjust ok
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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 (1.01s)
    unused:                                               [adjusted/master(unlocked) 251b67f] empty
adjust ok
unused . (checking for unused data...) ok
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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) aadb410] 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) a48d358] 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       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
    2       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
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              7 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              7 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.81s)
    describe:                                             [adjusted/master(unlocked) 4cb578f] empty
adjust ok
describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.36s)
    find:                                                 [adjusted/master(unlocked) 4cb578f] empty
adjust ok
get foo (from origin...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s   (checksum...)  0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
add dir/subfile 

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.87s)
    merge:                                                [adjusted/master(unlocked) a1fb705] empty
adjust ok
merge git-annex ok
OK (0.29s)
    info:                                                 [adjusted/master(unlocked) 7e89da6] empty
adjust ok
OK (0.32s)
    version:                                              [adjusted/master(unlocked) 7e89da6] empty
adjust ok
git-annex version: 7.20191017
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.3 feed-1.0.1.0 ghc-8.6.5 http-client-0.5.14 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0
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 powerpc64le
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.25s)
    sync:                                                 [adjusted/master(unlocked) 7e89da6] 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-7.20191017/test/.t/main0
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 
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...)
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-7.20191017/test/.t/main0
   34ac23c..94684f0  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-7.20191017/test/.t/main0
   94684f0..5abecc0  git-annex -> synced/git-annex
ok
OK (2.01s)
    union merge regression:                               [adjusted/master(unlocked) 9c77045] empty
adjust ok
[adjusted/master(unlocked) 9c77045] empty
adjust ok
[adjusted/master(unlocked) 546b5d2] empty
adjust ok
get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo40
 * [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 546b5d2..2647c4e
Fast-forward
ok
pull r1 
From ../../.t/tmprepo39
 * [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/tmprepo40
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo39
 * [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 9c77045..0cdad6f
Fast-forward
ok
pull r3 
From ../../.t/tmprepo41
 * [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/tmprepo39
 * [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/tmprepo41
   cf850e1..683a4f4  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
push r1 
To ../../.t/tmprepo39
   cf850e1..683a4f4  master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 9e78fc5..683a4f4
Fast-forward
(Merging into adjusted branch...) 
Updating 9c77045..0cdad6f
Fast-forward
ok
pull r3 
From ../../.t/tmprepo41
 * [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/tmprepo40
 * [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/tmprepo41
   6dc6bf5..b702be4  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo40
   6dc6bf5..41c47ee  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo41
   6dc6bf5..a6b2abe  git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo40
   6dc6bf5..a6b2abe  git-annex -> synced/git-annex
ok
OK (3.49s)
    adjusted branch merge regression:                     [adjusted/master(unlocked) 03205a6] empty
adjust ok
[adjusted/master(unlocked) 03205a6] empty
adjust ok
upgrade ok
adjust ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 0864e3f] git-annex in .t/tmprepo42
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo43
 * [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/tmprepo43
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
upgrade ok
adjust ok
add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f7d26dc] git-annex in .t/tmprepo43
 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 f7d26dc..c7783b9
Fast-forward
ok
pull r1 
From ../../.t/tmprepo42
 * [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/tmprepo42
   cd02c08..b456621  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 cd02c08..b456621
Fast-forward
(Merging into adjusted branch...) 
Updating 64e767b..45895a3
Fast-forward
ok
pull r2 
From ../../.t/tmprepo43
 + 03205a6...408cd3d adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   4ed4f70..465e30f  git-annex                 -> r2/git-annex
   cd02c08..b456621  master                    -> r2/master
   cd02c08..b456621  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo42
 + 64e767b...408cd3d adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (2.05s)
    adjusted branch subtree regression:                   [adjusted/master(unlocked) 2a12773] empty
adjust ok
upgrade ok
adjust ok
add a/b/c/d 

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

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

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

100%  11 B              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 45db457] git-annex in .t/tmprepo46
 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/tmprepo46
 * [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 3d533bf] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 9503451..f0d5b5b
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/tmprepo46
   4d27716..3d533bf  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 4d27716..3d533bf
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 dc2708b..bb6b575
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/tmprepo45
 * [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/tmprepo46
 + dc2708b...cccc875 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (2.80s)
    conflict resolution (adjusted branch):                [adjusted/master(unlocked) 85228d9] empty
adjust ok
[adjusted/master(unlocked) 8ef4360] empty
adjust ok
add conflictor 

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

100%  11 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 7ff210b] git-annex in .t/tmprepo48
 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/tmprepo48
 * [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 5fcfa4d] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 03b7004..7e80396
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/tmprepo48
   c845349..5fcfa4d  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 c845349..5fcfa4d
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 1d854cf..668e936
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/tmprepo47
 * [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/tmprepo48
 + 1d854cf...affe579 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s   (checksum...)  0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (2.36s)
    conflict resolution movein regression:                [adjusted/master(unlocked) f94712b] empty
adjust ok
[adjusted/master(unlocked) f94712b] empty
adjust ok
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[adjusted/master(unlocked) d3dec88] git-annex in .t/tmprepo49
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r2 
From ../../.t/tmprepo50
 * [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/tmprepo50
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[adjusted/master(unlocked) 192ec1a] git-annex in .t/tmprepo50
 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 58bb7eb] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 192ec1a..d398cc6
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/tmprepo49
 * [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/tmprepo49
   7889fa7..58bb7eb  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 7889fa7..58bb7eb
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 c46479e..e5c521f
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/tmprepo50
 + f94712b...492ceb5 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   817558c..c5922c7  git-annex                 -> r2/git-annex
   7889fa7..58bb7eb  master                    -> r2/master
   7889fa7..58bb7eb  synced/master             -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 
SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee

             22 100%    0.00kB/s    0:00:00  
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 
SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a

             22 100%    0.00kB/s    0:00:00  (checksum...) 
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
OK (2.63s)
    conflict resolution (mixed directory and file):       [adjusted/master(unlocked) 34c4a04] empty
adjust ok
[adjusted/master(unlocked) 97a669e] empty
adjust ok
add conflictor 

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

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 842b7f6] git-annex in .t/tmprepo52
 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/tmprepo52
 * [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 9b2149a] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 67465fe..304cd07
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/tmprepo52
   19bda6d..9b2149a  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 19bda6d..9b2149a
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 9172f91..eaab272
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo51
 * [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...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s   (checksum...)  0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
[adjusted/master(unlocked) 8eae765] empty
adjust ok
[adjusted/master(unlocked) 8eae765] empty
adjust ok
add conflictor 

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

100%  7 B               4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 3821fed] git-annex in .t/tmprepo54
 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/tmprepo53
 * [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 af73463] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating e177717..0527f55
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/tmprepo53
   ccd2ab3..af73463  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 ccd2ab3..af73463
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 bdf8b3f..d24fecf
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/tmprepo54
 * [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...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (4.88s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         [adjusted/master(unlocked) 59c826d] empty
adjust ok
[adjusted/master(unlocked) 1f06ba3] empty
adjust ok
add conflictor 

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 5e9311f] git-annex in .t/tmprepo55
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
On branch adjusted/master(unlocked)
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo55
 * [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 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
Updating 1f06ba3..6f799a7
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 1f06ba3..6f799a7
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo55
   2455385..781520d  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
[adjusted/master(unlocked) f397afd] empty
adjust ok
[adjusted/master(unlocked) f397afd] empty
adjust ok
add conflictor/file 

100%  7 B               4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f041fc8] git-annex in .t/tmprepo57
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/file
ok
On branch adjusted/master(unlocked)
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo57
 * [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 9c615c4..5027a56
Fast-forward
 conflictor/file | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/file
Updating f397afd..9afe1ee
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 f397afd..3537dd8
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo57
   5027a56..8d20fd4  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
OK (3.15s)
    conflict resolution (removed file):                   [adjusted/master(unlocked) 11c7135] empty
adjust ok
[adjusted/master(unlocked) a78fe46] empty
adjust ok
add conflictor 

100%  10 B              8 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 182839a] git-annex in .t/tmprepo59
 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/tmprepo59
 * [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...) Merge made by the 'recursive' strategy.
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
(Merging into adjusted branch...) 
Updating a78fe46..3633b91
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/tmprepo59
   5e12679..cb71e01  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 231a809] git-annex in .t/tmprepo59
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
merge synced/master (Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 231a809..65e0977
Fast-forward
ok
pull r2 
From ../../.t/tmprepo60
 * [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/tmprepo60
   cb71e01..4a130bb  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[adjusted/master(unlocked) 1531f8c] git-annex in .t/tmprepo60
 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 47a5f25] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 1531f8c..ce01aa9
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/tmprepo59
 + 82f04e2...558178b adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   0105abc..e4f6e73  git-annex                 -> r1/git-annex
   cb71e01..4a130bb  master                    -> r1/master
   cb71e01..4a130bb  synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo59
   0105abc..175ba2d  git-annex -> synced/git-annex
   4a130bb..47a5f25  master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating 4a130bb..47a5f25
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-0cbf
(Merging into adjusted branch...) 
Updating 558178b..776aabd
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo60
 + 5b0a756...64bac1f adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   e4f6e73..175ba2d  git-annex                 -> r2/git-annex
   4a130bb..47a5f25  master                    -> r2/master
   4a130bb..47a5f25  synced/master             -> r2/synced/master
ok
[adjusted/master(unlocked) 21ba117] empty
adjust ok
[adjusted/master(unlocked) 21ba117] empty
adjust ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 70453e8] git-annex in .t/tmprepo61
 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/tmprepo61
 * [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 8714c18..0710017
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
(Merging into adjusted branch...) 
Updating 21ba117..ea9f150
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/tmprepo61
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[adjusted/master(unlocked) cfd2eff] git-annex in .t/tmprepo62
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo61
   c61c35b..48ddb7f  git-annex -> synced/git-annex
   0710017..cfa36ad  master -> synced/master
ok
commit 
[adjusted/master(unlocked) 45349fc] git-annex in .t/tmprepo61
 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 89926e9] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 45349fc..2bc6446
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo62
 * [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/tmprepo62
   cfa36ad..89926e9  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 cfa36ad..89926e9
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 749c339..e3ef2c7
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/tmprepo61
 + e4e7d4f...ac92d88 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   cfa36ad..89926e9  master                    -> r1/master
   cfa36ad..89926e9  synced/master             -> r1/synced/master
ok
OK (4.90s)
    conflict resolution (nonannexed file):                [adjusted/master(unlocked) 42dcab9] empty
adjust ok
[adjusted/master(unlocked) 8f233d3] empty
adjust ok
add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 3c924c2] git-annex in .t/tmprepo63
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 7d70a16] git-annex in .t/tmprepo64
 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/tmprepo64
 * [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 590d829] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 81278b1..627eb97
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/tmprepo64
   7e60e22..590d829  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 7e60e22..590d829
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating dee9add..ee15c95
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo63
 * [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) d00a8c0] empty
adjust ok
[adjusted/master(unlocked) d00a8c0] empty
adjust ok
add conflictor 

100%  10 B              5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) cf7e1d2] git-annex in .t/tmprepo65
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 13e258e] git-annex in .t/tmprepo66
 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/tmprepo65
 * [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 792fda5] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 77b4575..cd2bcb1
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/tmprepo65
   22ee3db..792fda5  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 22ee3db..792fda5
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 afdb7ce..1a85004
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/tmprepo66
 * [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
(recording state in git...)
OK (3.60s)
    conflict resolution (nonannexed symlink):             [adjusted/master(unlocked) 1b4a6fb] empty
adjust ok
[adjusted/master(unlocked) 1b4a6fb] empty
adjust ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 01a0784] git-annex in .t/tmprepo67
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 0b97e7b] git-annex in .t/tmprepo68
 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/tmprepo68
 * [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 f25894d] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 2798bf8..8d369fb
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/tmprepo68
   bdc1dd0..f25894d  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 bdc1dd0..f25894d
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating c650d85..fe3af64
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo67
 * [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) 5640a6a] empty
adjust ok
[adjusted/master(unlocked) 5640a6a] empty
adjust ok
add conflictor 

100%  10 B              5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 504c4d6] git-annex in .t/tmprepo69
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) ef8f66f] git-annex in .t/tmprepo70
 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/tmprepo69
 * [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 55ba6a4] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating efd94e5..1606f4e
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/tmprepo69
   a11af1d..55ba6a4  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 a11af1d..55ba6a4
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 23ddde7..603f0a6
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/tmprepo70
 * [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.41s)
    conflict resolution (mixed locked and unlocked file): [adjusted/master(unlocked) bbb4593] empty
adjust ok
[adjusted/master(unlocked) c8cc373] empty
adjust ok
add conflictor 

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

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6adcde5] git-annex in .t/tmprepo72
 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/tmprepo72
 * [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 866a74d..d3e5057
Fast-forward
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo72
   e8249ac..a227e1a  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 e8249ac..a227e1a
Fast-forward
(Merging into adjusted branch...) 
Updating 881e5e3..081e54d
Fast-forward
ok
pull r1 
From ../../.t/tmprepo71
 * [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/tmprepo72
 + 881e5e3...491c043 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
OK (1.96s)
    map:                                                  [adjusted/master(unlocked) 30e40ba] 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.37s)
    uninit:                                               [adjusted/master(unlocked) 397e31b] empty
adjust ok
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was 974b03b).
OK (0.51s)
    uninit (in git-annex branch):                         [adjusted/master(unlocked) 397e31b] empty
adjust ok
Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.37s)
    upgrade:                                              [adjusted/master(unlocked) 1dbefd9] empty
adjust ok
upgrade ok
OK (0.27s)
    whereis:                                              [adjusted/master(unlocked) 1dbefd9] empty
adjust ok
whereis foo (1 copy) 
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 
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...)
whereis foo (1 copy) 
  	f77e9407-fe6a-49d7-b76a-a77a314f721b -- .t/tmprepo77 [here]
  The following untrusted locations may also have copies:
  	62a7150e-230b-4d55-95a5-5ce42441ab4e -- test repo [origin]
ok
OK (0.72s)
    hook remote:                                          [adjusted/master(unlocked) 9a867b8] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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.84s)
    directory remote:                                     [adjusted/master(unlocked) 9a867b8] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
copy foo (to foo...) 

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

100%  20 B             61 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.85s)
    rsync remote:                                         [adjusted/master(unlocked) 1dff052] empty
adjust ok
initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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.15s)
    bup remote:                                           [adjusted/master(unlocked) fdade5b] empty
adjust ok
OK (0.28s)
    crypto:                                               [adjusted/master(unlocked) f059710] empty
adjust ok
[adjusted/master(unlocked) f059710] empty
adjust ok
[adjusted/master(unlocked) f059710] empty
adjust ok
OK (0.76s)
    preferred content:                                    [adjusted/master(unlocked) f059710] empty
adjust ok
wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 
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...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 
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...)
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...) 
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...)
drop foo ok
(recording state in git...)
OK (1.68s)
    add subdirs:                                          [adjusted/master(unlocked) 208d74d] empty
adjust ok
add dir/foo 

100%  24 B             14 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.76s)
    addurl:                                               [adjusted/master(unlocked) f1ebcd8] empty
adjust ok
Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo87/myurl
download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo87/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo87/myurl 


(to _builddir_build_BUILD_git_annex_7.20191017_test_.t_tmprepo87_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo87/myurl 


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

100%  25 B            119 KiB/s 0s
                                  
ok
(recording state in git...)
unlock sha1foo ok
(recording state in git...)
OK (0.36s)
All 2 tests passed (0.43s)
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.32s)
    add extras:                                           add apple 


ok
(recording state in git...)
unlock apple ok
(recording state in git...)
OK (0.46s)
    export_import:                                        initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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             73 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating f3bc7eb..c876660
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             16 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master e8d1faf] git-annex in .t/tmprepo90
 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             11 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master d83359c] git-annex in .t/tmprepo90
 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             79 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             10 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master 509d7fc] git-annex in .t/tmprepo90
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (1.88s)
    export_import_subdir:                                 initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
[master 7d97f84] 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 41307f2..e39d73c
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 e39d73c..6c6eb54
Fast-forward
ok
(recording state in git...)
OK (1.64s)
    shared clone:                                         OK (0.23s)
    log:                                                  + Fri, 18 Oct 2019 08:28:21 UTC foo | bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- test repo [origin]
OK (0.30s)
    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.86s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.49s)
    unannex (no copy):                                    OK (0.29s)
    unannex (with copy):                                  get foo (from origin...) 
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...)
unannex foo ok
OK (0.50s)
    drop (no remote):                                     get foo (from origin...) 
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
drop foo ok
(recording state in git...)
OK (0.54s)
    drop (with remote):                                   get foo (from origin...) 
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...)
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.63s)
    drop (untrusted remote):                              untrust origin ok
(recording state in git...)
get foo (from origin...) 
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.50s)
    get:                                                  get foo (from origin...) 
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...)
OK (0.52s)
    get (ssh remote):                                     get foo (from origin...) 

100%  20 B              960 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.62s)
    move:                                                 move foo (from origin...) 
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...) (recording state in git...)
ok
(recording state in git...)
move foo (to origin...) 
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...) (recording state in git...)
ok
(recording state in git...)
OK (0.81s)
    move (ssh remote):                                    move foo (from origin...) 

100%  20 B              997 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.83s)
    copy:                                                 copy foo (from origin...) 
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...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.82s)
    lock:                                                 add newfile 

100%  3 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
unlock newfile ok
(recording state in git...)
get foo (from origin...) 
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: 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.04s)
    lock --force:                                         upgrade ok
get foo (from origin...) 
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: 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):                                 get foo (from origin...) 
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...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.68s)
    edit (pre-commit):                                    get foo (from origin...) 
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...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.54s)
    partial commit:                                       get foo (from origin...) 
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...)
(recording state in git...)
OK (0.71s)
    fix:                                                  OK (0.21s)
    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.70s)
    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...) 
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...)
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...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1(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 (1.01s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.18s)
    fsck (local untrusted):                               get foo (from origin...) 
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...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	46799b7b-e274-4010-9d48-dd10717768c8 -- .t/tmprepo115 [here]
   	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- 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.61s)
    fsck (remote untrusted):                              numcopies 2 ok
(recording state in git...)
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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: 
  	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- 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: 
  	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.73s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.29s)
    migrate:                                              get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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.97s)
    migrate (via gitattributes):                          get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1(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.96s)
    unused:                                               unused . (checking for unused data...) ok
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1(checksum...) )
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) ok
commit 
[master 743284f] git-annex in .t/tmprepo120
 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 70ff3b3] git-annex in .t/tmprepo120
 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       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
    2       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
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              9 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              8 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.77s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.27s)
    find:                                                 get foo (from origin...) 
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...)
add dir/subfile 

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.91s)
    merge:                                                merge git-annex ok
OK (0.24s)
    info:                                                 OK (0.25s)
    version:                                              git-annex version: 7.20191017
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.3 feed-1.0.1.0 ghc-8.6.5 http-client-0.5.14 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0
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 powerpc64le
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.22s)
    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-7.20191017/test/.t/main1
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 
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...)
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-7.20191017/test/.t/main1
   c9ca473..dd9fbba  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-7.20191017/test/.t/main1
   dd9fbba..766fc89  git-annex -> synced/git-annex
ok
OK (1.27s)
    union merge regression:                               get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo128
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
pull r1 
From ../../.t/tmprepo127
 * [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/tmprepo128
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo127
 * [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/tmprepo129
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r1 
From ../../.t/tmprepo127
 * [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/tmprepo129
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r2 
From ../../.t/tmprepo128
 * [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/tmprepo129
   8b82f87..b024645  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo128
   8b82f87..ed0d559  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo129
 * [new branch]      git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo128
   8b82f87..934e350  git-annex -> synced/git-annex
ok
OK (2.32s)
    adjusted branch merge regression:                     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) 39cbe7a] git-annex in .t/tmprepo130
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo131
 * [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/tmprepo131
 * [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              5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 54f7a0f] git-annex in .t/tmprepo131
 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 54f7a0f..60958c1
Fast-forward
ok
pull r1 
From ../../.t/tmprepo130
 * [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/tmprepo130
   146d856..4fab994  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 146d856..4fab994
Fast-forward
(Merging into adjusted branch...) 
Updating f07a7f4..c478823
Fast-forward
ok
pull r2 
From ../../.t/tmprepo131
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   9885e4f..256a2fd  git-annex                 -> r2/git-annex
   f3bc7eb..4fab994  master                    -> r2/master
   146d856..4fab994  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo130
 + f07a7f4...f45b51a adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (1.87s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

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

100%  3 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f9e42e3] git-annex in .t/tmprepo132
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (0.79s)
    conflict resolution:                                  commit (recording state in git...)
[master 7a48a63] git-annex in .t/tmprepo133
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master e4906fe] git-annex in .t/tmprepo134
 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/tmprepo134
 * [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 1a756f0] 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/tmprepo134
   e4906fe..1a756f0  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 e4906fe..1a756f0
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/tmprepo133
 * [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/tmprepo134
   e4906fe..1a756f0  master     -> r2/master
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (1.70s)
    conflict resolution (adjusted branch):                commit (recording state in git...)
[master 65ada0e] git-annex in .t/tmprepo135
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master d200486] git-annex in .t/tmprepo136
 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/tmprepo136
 * [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 8a49160] 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
   d200486..8a49160  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 d200486..8a49160
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 3bc58bb..4ba23ff
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
 + 3bc58bb...bd25d77 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (2.20s)
    conflict resolution movein regression:                get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[master 8896730] git-annex in .t/tmprepo137
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r2 
From ../../.t/tmprepo138
 * [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/tmprepo138
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[master 9558b00] git-annex in .t/tmprepo138
 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 6ae542d] git-annex automatic merge conflict fix
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
push r1 
To ../../.t/tmprepo137
   8896730..6ae542d  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 8896730..6ae542d
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/tmprepo138
   1867de3..0188ea1  git-annex     -> r2/git-annex
   f3bc7eb..6ae542d  master        -> r2/master
   8896730..6ae542d  synced/master -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 
SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee

             22 100%    0.00kB/s    0:00:00  
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 
SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a

             22 100%    0.00kB/s    0:00:00  
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (2.18s)
    conflict resolution (mixed directory and file):       commit (recording state in git...)
[master 8e34a62] git-annex in .t/tmprepo139
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master f1ad38b] git-annex in .t/tmprepo140
 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/tmprepo140
 * [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 cf6e27c] 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/tmprepo140
   f1ad38b..cf6e27c  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 f1ad38b..cf6e27c
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
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
get conflictor/subfile (from r2...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit (recording state in git...)
[master d74f6e1] git-annex in .t/tmprepo141
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master 73054b4] 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 r1 
From ../../.t/tmprepo141
 * [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 b7c73fb] 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/tmprepo141
   d74f6e1..b7c73fb  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 d74f6e1..b7c73fb
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/tmprepo142
 * [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...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (3.82s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         commit (recording state in git...)
[master 1906c04] git-annex in .t/tmprepo143
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
On branch master
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo143
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f3bc7eb..1906c04
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating f3bc7eb..1906c04
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo143
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo143'
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/tmprepo143
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo143'
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 e5bc332] git-annex in .t/tmprepo145
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor/file
ok
On branch master
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo145
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f3bc7eb..e5bc332
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating f3bc7eb..e5bc332
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
OK (1.98s)
    conflict resolution (removed file):                   commit (recording state in git...)
[master 5157876] git-annex in .t/tmprepo147
 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/tmprepo147
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating f3bc7eb..5157876
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/tmprepo147
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
[master 75c486c] git-annex in .t/tmprepo147
 1 file changed, 1 deletion(-)
 delete mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo148
 * [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/tmprepo148
   5157876..75c486c  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master 5dd2c88] git-annex in .t/tmprepo148
 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 6f9cfab] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo147
   2fbd1e6..733c9c5  git-annex     -> r1/git-annex
   5157876..75c486c  master        -> r1/master
   5157876..75c486c  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo147
   2fbd1e6..8b8bf4d  git-annex -> synced/git-annex
   75c486c..6f9cfab  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 75c486c..6f9cfab
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo148
   733c9c5..8b8bf4d  git-annex     -> r2/git-annex
   5157876..6f9cfab  master        -> r2/master
   75c486c..6f9cfab  synced/master -> r2/synced/master
ok
commit (recording state in git...)
[master 141dc4f] 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 f3bc7eb..141dc4f
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...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
commit 
(recording state in git...)
[master 3fce175] git-annex in .t/tmprepo150
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo149
   c771601..1f88ff5  git-annex -> synced/git-annex
   141dc4f..3fce175  master -> synced/master
ok
commit 
[master e294b08] git-annex in .t/tmprepo149
 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 3a78b55] git-annex automatic merge conflict fix
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
push r2 
To ../../.t/tmprepo150
   3fce175..3a78b55  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 3fce175..3a78b55
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/tmprepo149
   141dc4f..3a78b55  master        -> r1/master
   3fce175..3a78b55  synced/master -> r1/synced/master
ok
OK (3.77s)
    conflict resolution (nonannexed file):                commit (recording state in git...)
[master 805b911] git-annex in .t/tmprepo151
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 491b046] git-annex in .t/tmprepo152
 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/tmprepo152
 * [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 06b249d] git-annex automatic merge conflict fix
Already up to date.
ok
push r2 
To ../../.t/tmprepo152
   491b046..06b249d  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 491b046..06b249d
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
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
ok
(merging r1/git-annex into git-annex...)
commit (recording state in git...)
[master 4a9f076] git-annex in .t/tmprepo153
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master bac9263] 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 r1 
From ../../.t/tmprepo153
 * [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 fd7c8bf] 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/tmprepo153
   4a9f076..fd7c8bf  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 4a9f076..fd7c8bf
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/tmprepo154
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
(recording state in git...)
OK (3.47s)
    conflict resolution (nonannexed symlink):             commit (recording state in git...)
[master adbff6a] git-annex in .t/tmprepo155
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master ae1d305] git-annex in .t/tmprepo156
 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/tmprepo156
 * [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 7798590] 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/tmprepo156
   ae1d305..7798590  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 ae1d305..7798590
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-cc12
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
ok
commit (recording state in git...)
[master a009ed2] git-annex in .t/tmprepo157
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 0a39b68] 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 r1 
From ../../.t/tmprepo157
 * [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 1ce0db4] 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/tmprepo157
   a009ed2..1ce0db4  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 a009ed2..1ce0db4
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/tmprepo158
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.77s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

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

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master f265feb] git-annex in .t/tmprepo160
 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/tmprepo160
 * [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 ac27de1] 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/tmprepo160
   f265feb..ac27de1  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 f265feb..ac27de1
Fast-forward
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
ok
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo160
   f265feb..ac27de1  master     -> r2/master
ok
OK (1.73s)
    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.35s)
    uninit:                                               get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00(checksum...) kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was 14746e5).
OK (0.50s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.36s)
    upgrade:                                              upgrade ok
OK (0.25s)
    whereis:                                              whereis foo (1 copy) 
  	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 
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...)
whereis foo (1 copy) 
  	427c12f8-f07b-48e5-b9d8-f791bf83e88b -- .t/tmprepo165 [here]
  The following untrusted locations may also have copies:
  	bba4b5b5-f6c6-442c-97a2-488d4faa10cb -- test repo [origin]
ok
OK (0.56s)
    hook remote:                                          initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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.77s)
    directory remote:                                     initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
copy foo (to foo...) 

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

100%  20 B             56 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.65s)
    rsync remote:                                         initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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.01s)
    bup remote:                                           OK (0.44s)
    crypto:                                               OK (1.04s)
    preferred content:                                    wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 
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...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 
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...)
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...) 
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...)
drop foo ok
(recording state in git...)
OK (1.67s)
    add subdirs:                                          add dir/foo 

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

100%  20 B             11 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.49s)
    addurl:                                               Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo175/myurl
download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo175/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo175/myurl 


(to _builddir_build_BUILD_git_annex_7.20191017_test_.t_tmprepo175_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo175/myurl 


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

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

100%  25 B             98 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.21s)
All 2 tests passed (0.29s)
add foodup 

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


ok
(recording state in git...)
OK (0.31s)
    export_import:                                        initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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             74 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating 1ffd1d1..38ef448
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             15 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 206c7c5] git-annex in .t/tmprepo178
 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 dd41d2c] git-annex in .t/tmprepo178
 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             84 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             13 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master a81fb68] git-annex in .t/tmprepo178
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (1.69s)
    export_import_subdir:                                 initremote foo ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
fix subdir/foo ok
(recording state in git...)
[master 5832aaf] 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 604dd98..0797f99
Fast-forward
ok
(recording state in git...)
OK (1.15s)
    shared clone:                                         OK (0.21s)
    log:                                                  + Fri, 18 Oct 2019 08:29:25 UTC foo | 4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- test repo [origin]
OK (0.21s)
    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.60s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.35s)
    unannex (no copy):                                    OK (0.21s)
    unannex (with copy):                                  get foo (from origin...) 
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...)
unannex foo ok
OK (0.38s)
    drop (no remote):                                     get foo (from origin...) 
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
drop foo ok
(recording state in git...)
OK (0.40s)
    drop (with remote):                                   get foo (from origin...) 
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...)
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.43s)
    drop (untrusted remote):                              untrust origin ok
(recording state in git...)
get foo (from origin...) 
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.35s)
    get:                                                  get foo (from origin...) 
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...)
OK (0.37s)
    get (ssh remote):                                     get foo (from origin...) 

100%  20 B             1001 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (0.40s)
    move:                                                 move foo (from origin...) 
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...)
move foo (to origin...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  (checksum...) 
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
OK (0.67s)
    move (ssh remote):                                    move foo (from origin...) 

100%  20 B             1002 B/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.72s)
    copy:                                                 copy foo (from origin...) 
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...)
copy foo ok
move foo ok
(recording state in git...)
OK (0.69s)
    lock:                                                 add newfile 

100%  3 B               2 KiB/s 0s
                                  
ok
(recording state in git...)
unlock newfile ok
(recording state in git...)
get foo (from origin...) 
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...)
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.86s)
    lock --force:                                         upgrade ok
get foo (from origin...) 
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...)
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.42s)
    edit (no pre-commit):                                 get foo (from origin...) 
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...)
unlock foo ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.59s)
    edit (pre-commit):                                    get foo (from origin...) 
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...)
unlock foo ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (0.64s)
    partial commit:                                       get foo (from origin...) 
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...)
unlock foo ok
(recording state in git...)
(recording state in git...)
OK (0.61s)
    fix:                                                  get foo (from origin...) 
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...)
fix s/foo ok
(recording state in git...)
OK (0.43s)
    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.67s)
    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...) 
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...)
  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...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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.77s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.15s)
    fsck (local untrusted):                               get foo (from origin...) 
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...)
untrust origin ok
(recording state in git...)
untrust . ok
(recording state in git...)
  Only these untrusted locations may have copies of foo
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- test repo [origin]
   	bd98ccac-b9cf-416a-a7b7-3a0fd831b2db -- .t/tmprepo203 [here]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- 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.46s)
    fsck (remote untrusted):                              numcopies 2 ok
(recording state in git...)
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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: 
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- 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: 
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- test repo [origin]
git-annex: fsck: 2 failed
OK (0.47s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.25s)
    migrate:                                              get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  
             20 100%    0.00kB/s   (checksum...)  0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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.78s)
    unused:                                               unused . (checking for unused data...) ok
get foo (from origin...) 
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...)
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) (checking master...) ok
commit 
[master 57c23a3] git-annex in .t/tmprepo208
 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 ee3c453] git-annex in .t/tmprepo208
 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       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
    2       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
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              9 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             10 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              8 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
OK (1.33s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.29s)
    find:                                                 get foo (from origin...) 
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...)
add dir/subfile 

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.54s)
    merge:                                                merge git-annex ok
OK (0.25s)
    info:                                                 OK (0.26s)
    version:                                              git-annex version: 7.20191017
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.3 feed-1.0.1.0 ghc-8.6.5 http-client-0.5.14 persistent-sqlite-2.9.3 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0
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 powerpc64le
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.19s)
    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-7.20191017/test/.t/main2
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
get foo (from origin...) 
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...)
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-7.20191017/test/.t/main2
   5fd8ec0..0295b3e  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-7.20191017/test/.t/main2
   0295b3e..571b6fe  git-annex -> synced/git-annex
ok
OK (1.02s)
    union merge regression:                               get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
get foo (from origin...) 
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...)
commit 
On branch master
nothing to commit, working tree clean
ok
pull r2 
From ../../.t/tmprepo216
 * [new branch]      git-annex  -> r2/git-annex
 * [new branch]      master     -> r2/master
ok
pull r1 
From ../../.t/tmprepo215
 * [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/tmprepo216
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
push r1 
To ../../.t/tmprepo215
 * [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/tmprepo217
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r1 
From ../../.t/tmprepo215
 * [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/tmprepo217
 * [new branch]      git-annex     -> r3/git-annex
 * [new branch]      master        -> r3/master
 * [new branch]      synced/master -> r3/synced/master
ok
pull r2 
From ../../.t/tmprepo216
 * [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/tmprepo217
   38b12ce..237fb4c  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo216
   38b12ce..2b766d8  git-annex  -> r2/git-annex
ok
(merging r2/git-annex r3/git-annex into git-annex...)
(recording state in git...)
push r3 
To ../../.t/tmprepo217
 * [new branch]      git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo216
   38b12ce..b41af34  git-annex -> synced/git-annex
ok
OK (2.09s)
    adjusted branch merge regression:                     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) b88b8f7] git-annex in .t/tmprepo218
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
pull r2 
From ../../.t/tmprepo219
 * [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/tmprepo219
 * [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              5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) e21171e] git-annex in .t/tmprepo219
 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 e21171e..b068361
Fast-forward
ok
pull r1 
From ../../.t/tmprepo218
 * [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/tmprepo218
   05afc0d..8cef8b9  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 05afc0d..8cef8b9
Fast-forward
(Merging into adjusted branch...) 
Updating a067db0..9751115
Fast-forward
ok
pull r2 
From ../../.t/tmprepo219
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   a7cab26..2fa287f  git-annex                 -> r2/git-annex
   1ffd1d1..8cef8b9  master                    -> r2/master
   05afc0d..8cef8b9  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo218
 + a067db0...75b0b74 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (2.31s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

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

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

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

100%  11 B              8 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 614084b] git-annex in .t/tmprepo222
 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/tmprepo222
 * [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 e75609a] 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/tmprepo222
   614084b..e75609a  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 614084b..e75609a
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/tmprepo221
 * [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/tmprepo222
   614084b..e75609a  master     -> r2/master
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (1.38s)
    conflict resolution (adjusted branch):                add conflictor 

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

100%  11 B              8 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 0689fb1] git-annex in .t/tmprepo224
 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/tmprepo224
 * [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 fd4174a] 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/tmprepo224
   0689fb1..fd4174a  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 0689fb1..fd4174a
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 0649f5c..e1a5ae1
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/tmprepo223
 * [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/tmprepo224
 + 0649f5c...34866d1 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
get conflictor.variant-75dc (from r2...) 
SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-a507 (from r1...) 
SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544

             11 100%    0.00kB/s    0:00:00  
             11 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (1.72s)
    conflict resolution movein regression:                get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(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 86ce27d] git-annex in .t/tmprepo225
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite foo (100%)
 mode change 120000 => 100644
ok
pull r2 
From ../../.t/tmprepo226
 * [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/tmprepo226
 * [new branch]      git-annex -> synced/git-annex
 * [new branch]      master -> synced/master
ok
commit 
(recording state in git...)
[master 24ea383] git-annex in .t/tmprepo226
 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 6355d14] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo225
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo225
   86ce27d..6355d14  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 86ce27d..6355d14
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/tmprepo226
   41bf66c..5c9c553  git-annex     -> r2/git-annex
   1ffd1d1..6355d14  master        -> r2/master
   86ce27d..6355d14  synced/master -> r2/synced/master
ok
get foo.variant-bc25 (from r2...) 
SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee

             22 100%    0.00kB/s    0:00:00  
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get foo.variant-0b0e (from r1...) 
SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a

             22 100%    0.00kB/s    0:00:00  
             22 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (1.94s)
    conflict resolution (mixed directory and file):       add conflictor 

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

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 7827db6] git-annex in .t/tmprepo228
 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/tmprepo228
 * [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 40e8893] 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/tmprepo228
   7827db6..40e8893  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 7827db6..40e8893
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo227
 * [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...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
add conflictor 

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

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 4e8819f] git-annex in .t/tmprepo230
 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/tmprepo229
 * [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 9738ed4] 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/tmprepo229
   f7c2fc5..9738ed4  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 f7c2fc5..9738ed4
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/tmprepo230
 * [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...) 
SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7

              7 100%    0.00kB/s    0:00:00  
              7 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
get conflictor.variant-cc12 (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (2.50s)
    conflict resolution symlink bit:                      add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 8b40676] git-annex in .t/tmprepo231
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
pull origin 
ok
push origin 
To /builddir/build/BUILD/git-annex-7.20191017/test/.t/main2
   571b6fe..14b85dc  git-annex -> synced/git-annex
   1ffd1d1..8b40676  master -> synced/master
ok
add conflictor/subfile 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 38d17ec] git-annex in .t/tmprepo232
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/subfile
ok
pull origin 
From /builddir/build/BUILD/git-annex-7.20191017/test/.t/main2
   571b6fe..14b85dc  git-annex        -> origin/git-annex
   571b6fe..14b85dc  synced/git-annex -> origin/synced/git-annex
   1ffd1d1..8b40676  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 c9caac0] 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-7.20191017/test/.t/main2
   14b85dc..9b4a65b  git-annex -> synced/git-annex
   8b40676..c9caac0  master -> synced/master
ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 8b4c484] git-annex in .t/tmprepo233
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
pull origin 
From /builddir/build/BUILD/git-annex-7.20191017/test/.t/main2
   571b6fe..9b4a65b  git-annex        -> origin/git-annex
   571b6fe..9b4a65b  synced/git-annex -> origin/synced/git-annex
   1ffd1d1..c9caac0  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 79e505e] 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-7.20191017/test/.t/main2
   9b4a65b..7f6edee  git-annex -> synced/git-annex
   c9caac0..79e505e  master -> synced/master
ok
OK (2.04s)
    conflict resolution (uncommitted local file):         add conflictor 

100%  7 B               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 32950dc] git-annex in .t/tmprepo234
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
On branch master
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo234
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 1ffd1d1..32950dc
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 1ffd1d1..32950dc
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
To ../../.t/tmprepo234
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo234'
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/tmprepo234
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo234'
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               5 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 50eb53e] git-annex in .t/tmprepo236
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/file
ok
On branch master
Untracked files:
	conflictor
nothing added to commit but untracked files present
From ../../.t/tmprepo236
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 1ffd1d1..50eb53e
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 1ffd1d1..50eb53e
To ../../.t/tmprepo236
 * [new branch]      git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo236'
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/tmprepo236
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo236'
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.48s)
    conflict resolution (removed file):                   add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 0c7b7fe] git-annex in .t/tmprepo238
 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/tmprepo238
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 1ffd1d1..0c7b7fe
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/tmprepo238
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master 649e3b4] git-annex in .t/tmprepo238
 1 file changed, 1 deletion(-)
 delete mode 120000 conflictor
ok
pull r2 
From ../../.t/tmprepo239
 * [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/tmprepo239
   0c7b7fe..649e3b4  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master 94d1a41] git-annex in .t/tmprepo239
 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 d1f3d56] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo238
   e37396d..a699db9  git-annex     -> r1/git-annex
   0c7b7fe..649e3b4  master        -> r1/master
   0c7b7fe..649e3b4  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo238
   e37396d..c0616ea  git-annex -> synced/git-annex
   649e3b4..d1f3d56  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 649e3b4..d1f3d56
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo239
   a699db9..c0616ea  git-annex     -> r2/git-annex
   0c7b7fe..d1f3d56  master        -> r2/master
   649e3b4..d1f3d56  synced/master -> r2/synced/master
ok
add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 34b3a1e] git-annex in .t/tmprepo240
 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/tmprepo240
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
Updating 1ffd1d1..34b3a1e
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/tmprepo240
 * [new branch]      git-annex -> synced/git-annex
ok
get conflictor (from r1...) 
SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3

             10 100%    0.00kB/s    0:00:00  
             10 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
(recording state in git...)
[master 2adaa0f] git-annex in .t/tmprepo241
 1 file changed, 1 insertion(+), 1 deletion(-)
 rewrite conflictor (100%)
 mode change 120000 => 100644
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo240
   41c5e69..7c1bb0b  git-annex -> synced/git-annex
   34b3a1e..2adaa0f  master -> synced/master
ok
commit 
[master ff26c30] git-annex in .t/tmprepo240
 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 9f065de] git-annex automatic merge conflict fix
ok
pull r2 
From ../../.t/tmprepo241
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
push r2 
To ../../.t/tmprepo241
   2adaa0f..9f065de  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 2adaa0f..9f065de
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/tmprepo240
   34b3a1e..9f065de  master        -> r1/master
   2adaa0f..9f065de  synced/master -> r1/synced/master
ok
OK (3.38s)
    conflict resolution (nonannexed file):                add conflictor 

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 481267c] git-annex in .t/tmprepo242
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master fe36d5a] git-annex in .t/tmprepo243
 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/tmprepo243
 * [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 4cc33c7] git-annex automatic merge conflict fix
Already up to date.
ok
push r2 
To ../../.t/tmprepo243
   fe36d5a..4cc33c7  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
(recording state in git...)
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating fe36d5a..4cc33c7
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo242
 * [new branch]      git-annex     -> r1/git-annex
 * [new branch]      master        -> r1/master
 * [new branch]      synced/master -> r1/synced/master
ok
(merging r1/git-annex into git-annex...)
add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 014c9c8] git-annex in .t/tmprepo244
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master de42e47] git-annex in .t/tmprepo245
 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/tmprepo244
 * [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 d30e3eb] 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/tmprepo244
   014c9c8..d30e3eb  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 014c9c8..d30e3eb
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/tmprepo245
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.19s)
    conflict resolution (nonannexed symlink):             add conflictor 

100%  10 B              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 9f4f752] git-annex in .t/tmprepo246
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master a9172fb] git-annex in .t/tmprepo247
 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/tmprepo247
 * [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 d062ead] 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/tmprepo247
   a9172fb..d062ead  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 a9172fb..d062ead
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
ok
pull r1 
From ../../.t/tmprepo246
 * [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              7 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 4268715] git-annex in .t/tmprepo248
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 9c4826c] git-annex in .t/tmprepo249
 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/tmprepo248
 * [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 d205203] 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/tmprepo248
   4268715..d205203  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 4268715..d205203
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/tmprepo249
 * [new branch]      git-annex     -> r2/git-annex
 * [new branch]      master        -> r2/master
 * [new branch]      synced/master -> r2/synced/master
ok
OK (2.26s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

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

100%  10 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master dc22dc6] git-annex in .t/tmprepo251
 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/tmprepo251
 * [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 dc8fe1a] 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/tmprepo251
   dc22dc6..dc8fe1a  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 dc22dc6..dc8fe1a
Fast-forward
ok
pull r1 
From ../../.t/tmprepo250
 * [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/tmprepo251
   dc22dc6..dc8fe1a  master     -> r2/master
ok
OK (1.60s)
    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.31s)
    uninit:                                               get foo (from origin...) 
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
get sha1foo (from origin...) 
SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa

             25 100%    0.00kB/s    0:00:00  
             25 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
unannex foo ok
unannex sha1foo ok
Deleted branch git-annex (was 639143a).
OK (0.37s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.34s)
    upgrade:                                              upgrade ok
OK (0.19s)
    whereis:                                              whereis foo (1 copy) 
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- test repo [origin]
ok
untrust origin ok
(recording state in git...)
git-annex: whereis: 1 failed
get foo (from origin...) 
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...)
whereis foo (1 copy) 
  	f201a711-ff2a-4498-a234-6a44a3bfc229 -- .t/tmprepo256 [here]
  The following untrusted locations may also have copies:
  	4c375641-c77f-4ef2-b457-3fad3bb9fd4e -- test repo [origin]
ok
OK (0.49s)
    hook remote:                                          initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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...) 
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...)
copy foo (to foo...) 

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

100%  20 B             60 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (0.62s)
    rsync remote:                                         initremote foo ok
(recording state in git...)
get foo (from origin...) 
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...)
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.00kok
B/s    0:00:00 (xfr#1, to-chk=0/5)
(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.82s)
    bup remote:                                           OK (0.19s)
    crypto:                                               OK (0.61s)
    preferred content:                                    wanted . ok
(recording state in git...)
group . ok
(recording state in git...)
get foo (from origin...) 
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...)
drop foo ok
(recording state in git...)
copy foo (from origin...) 
SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77

             20 100%    0.00kB/s    0:00:00  (checksum...) 
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
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...) 
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...)
drop foo ok
(recording state in git...)
OK (1.37s)
    add subdirs:                                          add dir/foo 

100%  24 B             13 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master e60fdd6] git-annex in .t/tmprepo265
 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-7.20191017/test/.t/main2
   7f6edee..3e5778b  git-annex -> synced/git-annex
   79e505e..812f7c0  master -> synced/master
ok
add ../dir2/foo 

100%  20 B             14 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.62s)
    addurl:                                               Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo266/myurl
download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo266/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo266/myurl 


(to _builddir_build_BUILD_git_annex_7.20191017_test_.t_tmprepo266_myurl) ok
(recording state in git...)
addurl file:///builddir/build/BUILD/git-annex-7.20191017/test/.t/tmprepo266/myurl 


(to addurlurldest) ok
(recording state in git...)
OK (0.37s)
All 231 tests passed (240.67s)
+ popd
~/build/BUILD/git-annex-7.20191017
+ RPM_EC=0
++ jobs -p
+ exit 0
Processing files: git-annex-7.20191017-1.fc31.ppc64le
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.1j9AZ5
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191017
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex
+ cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex
+ cp -pr NEWS /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex
+ cp -pr README /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.B7Ke53
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191017
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex = 7.20191017-1.fc31 git-annex(ppc-64) = 7.20191017-1.fc31
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.17)(64bit) libdl.so.2()(64bit) libdl.so.2(GLIBC_2.17)(64bit) libffi.so.6()(64bit) libgmp.so.10()(64bit) libm.so.6()(64bit) libm.so.6(GLIBC_2.17)(64bit) libm.so.6(GLIBC_2.29)(64bit) libmagic.so.1()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libsqlite3.so.0()(64bit) libz.so.1()(64bit) rtld(GNU_HASH)
Processing files: git-annex-docs-7.20191017-1.fc31.noarch
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.PizSP4
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191017
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex-docs
+ export LC_ALL=C
+ LC_ALL=C
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex-docs
+ cp -pr html/ /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/doc/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.xOGbE5
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191017
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex-docs
+ export LC_ALL=C
+ LC_ALL=C
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex-docs
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le/usr/share/licenses/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex-docs = 7.20191017-1.fc31
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-7.20191017-1.fc31.ppc64le
Wrote: /builddir/build/RPMS/git-annex-docs-7.20191017-1.fc31.noarch.rpm
Wrote: /builddir/build/RPMS/git-annex-7.20191017-1.fc31.ppc64le.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.znaR95
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191017
+ /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-7.20191017-1.fc31.ppc64le
+ RPM_EC=0
++ jobs -p
+ exit 0
Child return code was: 0