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

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

100%  25 B             67 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.94s)
All 2 tests passed (1.17s)
[adjusted/master(unlocked) 5a6e181] empty
adjust ok
add foodup 

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


ok
(recording state in git...)
OK (0.96s)
    export_import:                                        [adjusted/master(unlocked) 84f6b75] 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             44 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master (Merging into master...) Updating bc405dc..c28f6be
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 bb38ea5..1bd24c4
Fast-forward
 bar.c  | 2 +-
 import | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 import
ok
add import 

100%  23 B              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 7b3caa1] 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              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 4270cea] 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             60 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              9 KiB/s 0s
                                  
ok
add import 

100%  23 B             54 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 6ba7acb] git-annex in .t/tmprepo2
ok
  unable to propigate merge commit Ref "77f676152b7afe57d3f1b1f0efbb7fb52bfec06c" back to Ref "refs/heads/master"
unexport foo import ok
export foo import ok
(recording state in git...)
OK (6.47s)
    export_import_subdir:                                 [adjusted/master(unlocked) 4835953] 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...)
[adjusted/master(unlocked) 3355a36] 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 3d9d9e8..ad774bf
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 5359f12..92e7518
Fast-forward
(Merging into adjusted branch...) 
Updating 6f16215..58885c0
Fast-forward
ok
(recording state in git...)
OK (3.75s)
    shared clone:                                         [adjusted/master(unlocked) e1bd7bd] empty
adjust ok
OK (0.72s)
    log:                                                  [adjusted/master(unlocked) 326ccd5] empty
adjust ok
+ Wed, 16 Oct 2019 08:48:05 UTC foo | d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- test repo [origin]
OK (0.80s)
    import:                                               [adjusted/master(unlocked) ef1e9a3] 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 (1.92s)
    reinject:                                             [adjusted/master(unlocked) 687cdf2] empty
adjust ok
reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (1.13s)
    unannex (no copy):                                    [adjusted/master(unlocked) e54302f] empty
adjust ok
OK (0.78s)
    unannex (with copy):                                  [adjusted/master(unlocked) 5b4356c] 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 (1.47s)
    drop (no remote):                                     [adjusted/master(unlocked) a69cb5c] 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 (1.37s)
    drop (with remote):                                   [adjusted/master(unlocked) f8529f0] 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...)
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 (1.58s)
    drop (untrusted remote):                              [adjusted/master(unlocked) ff3c34a] 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 (1.24s)
    get:                                                  [adjusted/master(unlocked) dbbe752] 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 (1.23s)
    get (ssh remote):                                     [adjusted/master(unlocked) 6bc3859] empty
adjust ok
get foo (from origin...) 

100%  20 B              663 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (1.24s)
    move:                                                 [adjusted/master(unlocked) 36eb242] 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 (2.09s)
    move (ssh remote):                                    [adjusted/master(unlocked) 767882f] empty
adjust ok
move foo (from origin...) 

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

100%  20 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.97s)
    copy:                                                 [adjusted/master(unlocked) 8ecf160] 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 (1.78s)
    lock:                                                 [adjusted/master(unlocked) 13f3991] empty
adjust ok
add newfile 

100%  3 B               1 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 (2.35s)
    lock --force:                                         [adjusted/master(unlocked) f321f22] 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 (1.39s)
    edit (no pre-commit):                                 [adjusted/master(unlocked) 22953be] 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 (1.40s)
    edit (pre-commit):                                    [adjusted/master(unlocked) 1fc7bcd] 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 (1.36s)
    partial commit:                                       [adjusted/master(unlocked) e74d925] 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 (1.29s)
    fix:                                                  [adjusted/master(unlocked) c45dd79] empty
adjust ok
OK (0.72s)
    trust:                                                [adjusted/master(unlocked) 55f2ef7] 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 (1.30s)
    fsck (basics):                                        [adjusted/master(unlocked) 58ea000] 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 (1.93s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.54s)
    fsck (local untrusted):                               [adjusted/master(unlocked) fb5b77f] 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
  	c8ef30b4-62d4-4784-8cc5-df7277e0d619 -- .t/tmprepo27 [here]
   	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- 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 (1.49s)
    fsck (remote untrusted):                              [adjusted/master(unlocked) 034ed53] 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: 
  	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- 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: 
  	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- test repo [origin]
git-annex: fsck: 2 failed
OK (1.64s)
    fsck --from remote:                                   [adjusted/master(unlocked) 0426d75] empty
adjust ok
fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.85s)
    migrate:                                              [adjusted/master(unlocked) 33a91a4] 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 (2.70s)
    migrate (via gitattributes):                          [adjusted/master(unlocked) 37bfbd7] 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 (2.47s)
    unused:                                               [adjusted/master(unlocked) f3c05d6] 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) 3489131] 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) 978a99b] git-annex in .t/tmprepo32
 1 file changed, 1 deletion(-)
 delete mode 100644 sha1foo
ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              5 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              5 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
(recording state in git...)
OK (3.72s)
    describe:                                             [adjusted/master(unlocked) be6b110] empty
adjust ok
describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.84s)
    find:                                                 [adjusted/master(unlocked) d886548] 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...)
add dir/subfile 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.84s)
    merge:                                                [adjusted/master(unlocked) 9167b03] empty
adjust ok
merge git-annex ok
OK (0.75s)
    info:                                                 [adjusted/master(unlocked) 6eff152] empty
adjust ok
OK (0.80s)
    version:                                              [adjusted/master(unlocked) 3492ba8] empty
adjust ok
git-annex version: 7.20191009
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 aarch64
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.67s)
    sync:                                                 [adjusted/master(unlocked) 214c568] 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.20191009/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.20191009/test/.t/main0
   ab8403b..0aea3b8  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.20191009/test/.t/main0
   0aea3b8..a7401b4  git-annex -> synced/git-annex
ok
OK (2.59s)
    union merge regression:                               [adjusted/master(unlocked) 6d50cce] empty
adjust ok
[adjusted/master(unlocked) c69676e] empty
adjust ok
[adjusted/master(unlocked) 29f74b8] 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 29f74b8..96b4ef2
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
(Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 361896f..ab83461
Fast-forward
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 c69676e..7d58bcd
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
   9f2fad9..c5ff804  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
push r1 
To ../../.t/tmprepo39
   9f2fad9..c5ff804  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 6d50cce..7416d75
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
push r3 
To ../../.t/tmprepo41
   c5ff804..b215531  master -> synced/master
ok
push r2 
To ../../.t/tmprepo40
   c5ff804..b215531  master -> 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
   b3604f5..fc55c2c  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo40
   b3604f5..67cc0a9  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
   b3604f5..c159ab7  git-annex -> synced/git-annex
ok
push r2 
To ../../.t/tmprepo40
   b3604f5..c159ab7  git-annex -> synced/git-annex
ok
OK (7.06s)
    adjusted branch merge regression:                     [adjusted/master(unlocked) 2c74b7c] empty
adjust ok
[adjusted/master(unlocked) a6ed823] empty
adjust ok
upgrade ok
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 949a986] 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
(Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 949a986..84b209c
Fast-forward
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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 88920a2] 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 88920a2..c7f0363
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
   36c2454..8542f69  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 36c2454..8542f69
Fast-forward
(Merging into adjusted branch...) 
Updating 33e4030..ffe9cc6
Fast-forward
ok
pull r2 
From ../../.t/tmprepo43
 + a6ed823...ebf6889 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   bdcdee3..d48c1b7  git-annex                 -> r2/git-annex
   36c2454..8542f69  master                    -> r2/master
   36c2454..8542f69  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo42
 + 33e4030...ebf6889 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (3.94s)
    adjusted branch subtree regression:                   [adjusted/master(unlocked) d224d7f] 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) 71c59ab] 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               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 918e1ad] git-annex in .t/tmprepo44
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (1.84s)
    conflict resolution:                                  [adjusted/master(unlocked) 373361a] empty
adjust ok
[adjusted/master(unlocked) c7264f2] empty
adjust ok
add conflictor 

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

100%  11 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 026adc2] 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 83e798c] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating a374568..2840641
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
   b844874..83e798c  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 b844874..83e798c
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 4a83aee..31b4395
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
 + 4a83aee...90ad14b 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 (5.21s)
    conflict resolution (adjusted branch):                [adjusted/master(unlocked) 4f03f56] empty
adjust ok
[adjusted/master(unlocked) b5c6951] empty
adjust ok
add conflictor 

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

100%  11 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 719ebbd] 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 636c5e4] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 65c1062..11acea9
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
   705606f..636c5e4  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 705606f..636c5e4
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 51efba0..239edd9
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
 + 51efba0...c7d7e97 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 (5.13s)
    conflict resolution movein regression:                [adjusted/master(unlocked) 4f49cd0] empty
adjust ok
[adjusted/master(unlocked) c6673fa] 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) 8ab4ae4] 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
(Merging into master...) Already up to date!
Merge made by the 'recursive' strategy.
(Merging into adjusted branch...) 
Updating 8ab4ae4..3c64725
Fast-forward
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) 32b8c60] 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 b106459] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 32b8c60..5659794
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
   e9165e0..b106459  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 e9165e0..b106459
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 e39c6b5..7739897
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
 + c6673fa...8b70d25 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   171d4a9..189cfd5  git-annex                 -> r2/git-annex
   e9165e0..b106459  master                    -> r2/master
   e9165e0..b106459  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 (5.61s)
    conflict resolution (mixed directory and file):       [adjusted/master(unlocked) 8de55a9] empty
adjust ok
[adjusted/master(unlocked) 2db0bb9] empty
adjust ok
add conflictor 

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

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) ddf50aa] 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 26dbd7d] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 0355d5f..c1e559c
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
   e3a3481..26dbd7d  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 e3a3481..26dbd7d
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 23f9410..8f6c0f3
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    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
[adjusted/master(unlocked) 16510a6] empty
adjust ok
[adjusted/master(unlocked) 16510a6] empty
adjust ok
add conflictor 

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

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) e810fd2] 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 e387199] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating c6e44ff..d71aa67
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
   8877211..e387199  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 8877211..e387199
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 b8b2541..ad5413f
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 (checksum...)    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
OK (9.17s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         [adjusted/master(unlocked) 01a8adb] empty
adjust ok
[adjusted/master(unlocked) c8b7cc3] empty
adjust ok
add conflictor 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 669c57d] 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 c8b7cc3..484e208
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 c8b7cc3..28dd372
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
   af719cf..c1bfc3c  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
[adjusted/master(unlocked) c898b23] empty
adjust ok
[adjusted/master(unlocked) 4e2dcf3] empty
adjust ok
add conflictor/file 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 62b197f] 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
Merge made by the 'recursive' strategy.
 conflictor/file | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor/file
Updating 4e2dcf3..68cb347
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 4e2dcf3..6b18d40
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
   8f66f46..6c258f0  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
git-annex: sync: 1 failed
OK (5.93s)
    conflict resolution (removed file):                   [adjusted/master(unlocked) 3240fd4] empty
adjust ok
[adjusted/master(unlocked) 881d2c9] empty
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 9a2e4a0] 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 881d2c9..5433c64
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
   b99bc37..2284e0b  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) b9af7df] 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 b9af7df..90aff20
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
   2284e0b..c6fd99f  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[adjusted/master(unlocked) a398599] 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 aaff65d] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating a398599..2dbf0ba
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
 + 6f15dc7...5974dfc adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   15b0fb0..552350c  git-annex                 -> r1/git-annex
   2284e0b..c6fd99f  master                    -> r1/master
   2284e0b..c6fd99f  synced/master             -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo59
   15b0fb0..340fa51  git-annex -> synced/git-annex
   c6fd99f..aaff65d  master -> synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
merge synced/master (Merging into master...) Updating c6fd99f..aaff65d
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-0cbf
(Merging into adjusted branch...) 
Updating 5974dfc..096b8de
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo60
 + 0b2187c...c5b5f10 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
   552350c..340fa51  git-annex                 -> r2/git-annex
   c6fd99f..aaff65d  master                    -> r2/master
   c6fd99f..aaff65d  synced/master             -> r2/synced/master
ok
[adjusted/master(unlocked) 6aaa6d6] empty
adjust ok
[adjusted/master(unlocked) 6aaa6d6] empty
adjust ok
add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 48fe02d] 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 ff153e3..2eb3d23
Fast-forward
 conflictor | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
(Merging into adjusted branch...) 
Updating 6aaa6d6..6eef14c
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) c26b0be] git-annex in .t/tmprepo62
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo61
   95ff930..ace8f3c  git-annex -> synced/git-annex
   2eb3d23..a88a0a0  master -> synced/master
ok
commit 
[adjusted/master(unlocked) ecb7c29] 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 6982729] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating ecb7c29..ebf4f68
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
   a88a0a0..6982729  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 a88a0a0..6982729
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 d379f66..8f76fa2
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
 + f5f0356...7f57416 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
   a88a0a0..6982729  master                    -> r1/master
   a88a0a0..6982729  synced/master             -> r1/synced/master
ok
OK (10.53s)
    conflict resolution (nonannexed file):                [adjusted/master(unlocked) a08523c] empty
adjust ok
[adjusted/master(unlocked) a08523c] empty
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) edb67f9] git-annex in .t/tmprepo63
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 0f2ddcc] 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 f6a3701] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 1f656a5..645c93a
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
   d4367e1..f6a3701  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 d4367e1..f6a3701
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 5c7873c..41721ec
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) 0a25d6b] empty
adjust ok
[adjusted/master(unlocked) 9553139] empty
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 4b3cc64] git-annex in .t/tmprepo65
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) f772c27] 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 e71388a] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating 93688f3..46efd87
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
   a64e626..e71388a  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 a64e626..e71388a
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 801ad6e..8c2ab6f
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 (7.61s)
    conflict resolution (nonannexed symlink):             [adjusted/master(unlocked) 930b500] empty
adjust ok
[adjusted/master(unlocked) a9ae703] empty
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 5da0e77] git-annex in .t/tmprepo67
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) fcd3279] 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 ae62dec] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating c56a233..bd7c6d0
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
   a189f94..ae62dec  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 a189f94..ae62dec
Fast-forward
 conflictor.variant-cc12 | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor.variant-cc12
(Merging into adjusted branch...) 
Updating 06f3826..d6fd9b8
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) 15f77ee] empty
adjust ok
[adjusted/master(unlocked) 15f77ee] empty
adjust ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 68cd700] git-annex in .t/tmprepo69
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[adjusted/master(unlocked) 6530b44] 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 384d862] git-annex automatic merge conflict fix
(Merging into adjusted branch...) 
Updating ef71707..4e439e5
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
   49072a0..384d862  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 49072a0..384d862
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 82aae7b..febc263
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 (7.09s)
    conflict resolution (mixed locked and unlocked file): [adjusted/master(unlocked) d4ce65b] empty
adjust ok
[adjusted/master(unlocked) 1a27a0b] empty
adjust ok
add conflictor 

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

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 5e79a1a] 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 823b08a..481c76e
Fast-forward
ok
(merging r2/git-annex into git-annex...)
(recording state in git...)
push r2 
To ../../.t/tmprepo72
   a57aa6c..462e2cb  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 a57aa6c..462e2cb
Fast-forward
(Merging into adjusted branch...) 
Updating 86935da..3703640
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
 + 86935da...2ae2148 adjusted/master(unlocked) -> r2/adjusted/master(unlocked)  (forced update)
ok
OK (3.87s)
    map:                                                  [adjusted/master(unlocked) 3fcaffe] 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.94s)
    uninit:                                               [adjusted/master(unlocked) e3ce56c] 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 f2917de).
OK (1.44s)
    uninit (in git-annex branch):                         [adjusted/master(unlocked) 19ffb2d] empty
adjust ok
Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.85s)
    upgrade:                                              [adjusted/master(unlocked) 19ffb2d] empty
adjust ok
upgrade ok
OK (0.75s)
    whereis:                                              [adjusted/master(unlocked) e7b7005] empty
adjust ok
whereis foo (1 copy) 
  	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- 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) 
  	cbd76dde-eb70-42f1-8823-f7ca0ba8ee94 -- .t/tmprepo77 [here]
  The following untrusted locations may also have copies:
  	d2ce3a0b-03fa-4d3a-af71-332e4e8e4b29 -- test repo [origin]
ok
OK (1.29s)
    hook remote:                                          [adjusted/master(unlocked) 2412eec] 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 (checksum...)    0:00:00 (xfr#1, to-chk=0/1)
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 (2.38s)
    directory remote:                                     [adjusted/master(unlocked) 426d0cb] 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             20 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             40 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (1.98s)
    rsync remote:                                         [adjusted/master(unlocked) 3bcdb0e] 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 (2.25s)
    bup remote:                                           [adjusted/master(unlocked) 37c9894] empty
adjust ok
OK (0.64s)
    crypto:                                               [adjusted/master(unlocked) 15d00d8] empty
adjust ok
[adjusted/master(unlocked) 15d00d8] empty
adjust ok
[adjusted/master(unlocked) cadad8a] empty
adjust ok
OK (2.13s)
    preferred content:                                    [adjusted/master(unlocked) 7cead1d] 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 (3.59s)
    add subdirs:                                          [adjusted/master(unlocked) c81a9b9] empty
adjust ok
add dir/foo 

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

100%  20 B              8 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.55s)
    addurl:                                               [adjusted/master(unlocked) b9a79ba] empty
adjust ok
Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191009/test/.t/tmprepo87/myurl
download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191009/test/.t/tmprepo87/myurl
git-annex: addurl: 1 failed
addurl file:///builddir/build/BUILD/git-annex-7.20191009/test/.t/tmprepo87/myurl 


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


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

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


ok
(recording state in git...)
unlock apple ok
(recording state in git...)
OK (1.06s)
    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             44 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating 55ecead..5c22409
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              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 2d21cb3] 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              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 5474283] 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             67 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              9 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master a8c55c9] git-annex in .t/tmprepo90
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (5.35s)
    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 5396a0a] 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 631d584..af8b244
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 af8b244..4583dc9
Fast-forward
ok
(recording state in git...)
OK (3.66s)
    shared clone:                                         OK (0.67s)
    log:                                                  + Wed, 16 Oct 2019 08:50:44 UTC foo | 823031b4-fa6d-4081-aebc-285e4f46e618 -- test repo [origin]
OK (0.68s)
    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 (1.24s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (1.08s)
    unannex (no copy):                                    OK (1.09s)
    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 (1.23s)
    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 (1.31s)
    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 (1.40s)
    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 (1.15s)
    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 (1.12s)
    get (ssh remote):                                     get foo (from origin...) 

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

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

100%  20 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.82s)
    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 (1.70s)
    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 (2.20s)
    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 (1.23s)
    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 (1.36s)
    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 (1.18s)
    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 (1.37s)
    fix:                                                  OK (0.60s)
    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 (1.32s)
    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.75s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.54s)
    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
  	1daa7a73-7149-4120-a999-2b62ff1a9c0b -- .t/tmprepo115 [here]
   	823031b4-fa6d-4081-aebc-285e4f46e618 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	823031b4-fa6d-4081-aebc-285e4f46e618 -- 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 (1.31s)
    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: 
  	823031b4-fa6d-4081-aebc-285e4f46e618 -- 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: 
  	823031b4-fa6d-4081-aebc-285e4f46e618 -- test repo [origin]
git-annex: fsck: 2 failed
OK (1.47s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (0.65s)
    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 (2.31s)
    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 (2.48s)
    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 46f218f] 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 e12af85] 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       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              5 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              5 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 (3.19s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.69s)
    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               3 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.42s)
    merge:                                                merge git-annex ok
OK (0.65s)
    info:                                                 OK (0.63s)
    version:                                              git-annex version: 7.20191009
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 aarch64
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.60s)
    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.20191009/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.20191009/test/.t/main1
   cee92dd..8c4c07f  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.20191009/test/.t/main1
   8c4c07f..ed69f8e  git-annex -> synced/git-annex
ok
OK (2.26s)
    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
   a3519c3..ad68731  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo128
   a3519c3..d5ff691  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
   a3519c3..92a0499  git-annex -> synced/git-annex
ok
OK (4.94s)
    adjusted branch merge regression:                     upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f042a98] 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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 5c04831] 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 5c04831..573769d
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
   b6d7727..259ea2f  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 b6d7727..259ea2f
Fast-forward
(Merging into adjusted branch...) 
Updating 11cf0b6..8e1f27b
Fast-forward
ok
pull r2 
From ../../.t/tmprepo131
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   b858799..0082369  git-annex                 -> r2/git-annex
   55ecead..259ea2f  master                    -> r2/master
   b6d7727..259ea2f  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo130
 + 11cf0b6...a727d12 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (3.47s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

100%  3 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) c139eae] 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               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) bfa0c43] git-annex in .t/tmprepo132
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (1.57s)
    conflict resolution:                                  commit (recording state in git...)
[master c7d9149] git-annex in .t/tmprepo133
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master b1c599e] 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 f6d51c1] 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
   b1c599e..f6d51c1  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 b1c599e..f6d51c1
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
   b1c599e..f6d51c1  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 (4.17s)
    conflict resolution (adjusted branch):                commit (recording state in git...)
[master 9119291] git-annex in .t/tmprepo135
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master 8d6fabe] 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 890e859] 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
   8d6fabe..890e859  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 8d6fabe..890e859
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 65829a3..40e8197
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
 + 65829a3...9fb79ab 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 (4.35s)
    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 e4bd35f] 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 494ad08] 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 a4d4c04] 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
   e4bd35f..a4d4c04  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 e4bd35f..a4d4c04
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
   c24af21..3a5a1de  git-annex     -> r2/git-annex
   55ecead..a4d4c04  master        -> r2/master
   e4bd35f..a4d4c04  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 (5.03s)
    conflict resolution (mixed directory and file):       commit (recording state in git...)
[master e3278dc] git-annex in .t/tmprepo139
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master f8e32d5] 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 aab11fa] 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
   f8e32d5..aab11fa  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 f8e32d5..aab11fa
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 48982e7] git-annex in .t/tmprepo141
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit (recording state in git...)
[master 6433e6e] 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 e05d825] 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
   48982e7..e05d825  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 48982e7..e05d825
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 (checksum...)    0:00:00 (xfr#1, to-chk=0/1)
ok
(recording state in git...)
OK (7.98s)
    conflict resolution symlink bit:                      OK
    conflict resolution (uncommitted local file):         commit (recording state in git...)
[master 9676aa3] 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 55ecead..9676aa3
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 55ecead..9676aa3
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 eba0e38] 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 55ecead..eba0e38
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating 55ecead..eba0e38
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 (4.03s)
    conflict resolution (removed file):                   commit (recording state in git...)
[master 72cc2a4] 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 55ecead..72cc2a4
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 263973f] 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
   72cc2a4..263973f  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master c2a2a2b] 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 20f10bd] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo147
   2f3b0c8..89a0d1d  git-annex     -> r1/git-annex
   72cc2a4..263973f  master        -> r1/master
   72cc2a4..263973f  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo147
   2f3b0c8..820b2a0  git-annex -> synced/git-annex
   263973f..20f10bd  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating 263973f..20f10bd
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo148
   89a0d1d..820b2a0  git-annex     -> r2/git-annex
   72cc2a4..20f10bd  master        -> r2/master
   263973f..20f10bd  synced/master -> r2/synced/master
ok
commit (recording state in git...)
[master 6ebd95d] 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 55ecead..6ebd95d
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 26c696f] git-annex in .t/tmprepo150
 1 file changed, 1 insertion(+), 1 deletion(-)
ok
pull r1 
ok
push r1 
To ../../.t/tmprepo149
   a555486..030aef2  git-annex -> synced/git-annex
   6ebd95d..26c696f  master -> synced/master
ok
commit 
[master d2c2a9e] 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 91e721f] 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
   26c696f..91e721f  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 26c696f..91e721f
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
   6ebd95d..91e721f  master        -> r1/master
   26c696f..91e721f  synced/master -> r1/synced/master
ok
OK (9.80s)
    conflict resolution (nonannexed file):                commit (recording state in git...)
[master 34d82d4] git-annex in .t/tmprepo151
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 9d17a0f] 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 a7ab7f7] git-annex automatic merge conflict fix
Already up to date.
ok
push r2 
To ../../.t/tmprepo152
   9d17a0f..a7ab7f7  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 9d17a0f..a7ab7f7
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 9429894] git-annex in .t/tmprepo153
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master a1a947e] 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 092cf49] 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
   9429894..092cf49  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 9429894..092cf49
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 (7.88s)
    conflict resolution (nonannexed symlink):             commit (recording state in git...)
[master 604d47e] git-annex in .t/tmprepo155
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 724e336] 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 350ae4c] 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
   724e336..350ae4c  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 724e336..350ae4c
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 ff0b3d6] git-annex in .t/tmprepo157
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor
ok
commit 
[master 40e9915] 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 e4d7d04] 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
   ff0b3d6..e4d7d04  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 ff0b3d6..e4d7d04
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 (6.90s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

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

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master 957a6dc] 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 e0994df] 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
   957a6dc..e0994df  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 957a6dc..e0994df
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
   957a6dc..e0994df  master     -> r2/master
ok
OK (3.88s)
    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.93s)
    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 0ec5185).
OK (1.81s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.82s)
    upgrade:                                              upgrade ok
OK (0.76s)
    whereis:                                              whereis foo (1 copy) 
  	823031b4-fa6d-4081-aebc-285e4f46e618 -- 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) 
  	7c212c53-65c0-4885-947e-cbe33dde8b18 -- .t/tmprepo165 [here]
  The following untrusted locations may also have copies:
  	823031b4-fa6d-4081-aebc-285e4f46e618 -- test repo [origin]
ok
OK (1.52s)
    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 (2.22s)
    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             21 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             36 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (2.25s)
    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 (2.62s)
    bup remote:                                           OK (0.68s)
    crypto:                                               OK (2.12s)
    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 (4.49s)
    add subdirs:                                          add dir/foo 

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

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


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


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

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

100%  25 B             70 KiB/s 0s
                                  
ok
(recording state in git...)
OK (0.36s)
All 2 tests passed (0.49s)
add foodup 

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


ok
(recording state in git...)
OK (0.88s)
    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             47 KiB/s 0s
                                  
ok
update refs/remotes/foo/master ok
(recording state in git...)
merge foo/master 
Updating fe1b94a..5fec82d
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              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master a369d4c] 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              9 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master b75d3ec] 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             67 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              9 KiB/s 0s
                                  
ok
add import ok
add import ok
(recording state in git...)
commit 
[master c0c2c4c] git-annex in .t/tmprepo178
ok
unexport foo import ok
export foo import ok
(recording state in git...)
OK (5.56s)
    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 3f6054e] 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 87ae582..e51c7ba
Fast-forward
ok
(recording state in git...)
OK (3.56s)
    shared clone:                                         OK (0.67s)
    log:                                                  + Wed, 16 Oct 2019 08:53:09 UTC foo | b7db5786-18cb-440c-872a-5dd309840c75 -- test repo [origin]
OK (0.77s)
    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 (1.44s)
    reinject:                                             reinject tmpfile (checksum...) ok
(recording state in git...)
fromkey sha1foodup ok
(recording state in git...)
OK (0.97s)
    unannex (no copy):                                    OK (0.92s)
    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.94s)
    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 (1.01s)
    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 (1.14s)
    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.99s)
    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.91s)
    get (ssh remote):                                     get foo (from origin...) 

100%  20 B              728 B/s 0s
                                  
(checksum...) ok
(recording state in git...)
OK (1.04s)
    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  
             20 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
OK (1.65s)
    move (ssh remote):                                    move foo (from origin...) 

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

100%  20 B              6 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.55s)
    copy:                                                 copy 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...)
copy foo ok
move foo ok
(recording state in git...)
OK (2.04s)
    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...)
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 (2.38s)
    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 (1.41s)
    edit (no pre-commit):                                 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...)
unlock foo ok
(recording state in git...)
(recording state in git...)
git-annex: drop: 1 failed
OK (1.63s)
    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 (1.38s)
    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 (1.50s)
    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 (1.20s)
    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 (1.40s)
    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 (1.78s)
    fsck (bare):                                          fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok
(recording state in git...)
OK (0.74s)
    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
  	5b96ee42-ab4e-49da-8ade-5c499f561d16 -- .t/tmprepo203 [here]
   	b7db5786-18cb-440c-872a-5dd309840c75 -- test repo [origin]
  Back it up to trusted locations with git-annex copy.
  Only these untrusted locations may have copies of sha1foo
  	b7db5786-18cb-440c-872a-5dd309840c75 -- 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 (1.11s)
    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: 
  	b7db5786-18cb-440c-872a-5dd309840c75 -- 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: 
  	b7db5786-18cb-440c-872a-5dd309840c75 -- test repo [origin]
git-annex: fsck: 2 failed
OK (1.37s)
    fsck --from remote:                                   fsck foo (checksum...) ok
fsck sha1foo (checksum...) ok
(recording state in git...)
OK (1.09s)
    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 (1.44s)
    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...) (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 (1.41s)
    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 e8d25f9] 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 1f1cc32] 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       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
    2       SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok
unused . (checking for unused data...) (checking master...) 
  Some annexed data is no longer used by any files:
    NUMBER  KEY
    1       SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
  (To see where data was previously used, try: git log --stat --no-textconv -S'KEY')
  
  To remove unwanted data: git-annex dropunused NUMBER
  
ok
(recording state in git...)
git-annex: dropunused: 1 failed
dropunused 1 ok
(recording state in git...)
unused . (checking for unused data...) ok
git-annex: 10 not valid (run git annex unused for list)
add unusedfile 

100%  13 B              5 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              5 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              5 KiB/s 0s
                                  
ok
(recording state in git...)
unused . (checking for unused data...) ok
unused . (checking for unused data...) ok
OK (2.31s)
    describe:                                             describe . ok
(recording state in git...)
describe origin ok
(recording state in git...)
OK (0.95s)
    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               3 KiB/s 0s
                                  
ok
(recording state in git...)
OK (1.16s)
    merge:                                                merge git-annex ok
OK (0.74s)
    info:                                                 OK (0.99s)
    version:                                              git-annex version: 7.20191009
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 aarch64
supported repository versions: 7
upgrade supported from repository versions: 0 1 2 3 4 5 6
local repository version: 7
OK (0.85s)
    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.20191009/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.20191009/test/.t/main2
   28e1aa7..8445743  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.20191009/test/.t/main2
   8445743..cf9b6bf  git-annex -> synced/git-annex
ok
OK (1.95s)
    union merge regression:                               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 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
   f0e21c1..64c9600  git-annex  -> r3/git-annex
ok
pull r2 
From ../../.t/tmprepo216
   f0e21c1..6413ad0  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
   f0e21c1..a471f8e  git-annex -> synced/git-annex
ok
OK (5.03s)
    adjusted branch merge regression:                     upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 3313e69] 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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) f3c87d2] 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 f3c87d2..d66b5ef
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
   3cbff11..6e5bf37  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 3cbff11..6e5bf37
Fast-forward
(Merging into adjusted branch...) 
Updating 1751450..c82a3de
Fast-forward
ok
pull r2 
From ../../.t/tmprepo219
 * [new branch]      adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
   aa7e667..9190032  git-annex                 -> r2/git-annex
   fe1b94a..6e5bf37  master                    -> r2/master
   3cbff11..6e5bf37  synced/master             -> r2/synced/master
ok
commit 
On branch adjusted/master(unlocked)
nothing to commit, working tree clean
ok
pull r1 
From ../../.t/tmprepo218
 + 1751450...3f83972 adjusted/master(unlocked) -> r1/adjusted/master(unlocked)  (forced update)
ok
OK (4.93s)
    adjusted branch subtree regression:                   upgrade ok
adjust 
Switched to branch 'adjusted/master(unlocked)'
ok
add a/b/c/d 

100%  3 B               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 4a8020a] 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               1 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[adjusted/master(unlocked) 127ca6e] git-annex in .t/tmprepo220
 1 file changed, 1 insertion(+)
 create mode 100644 a/b/x/y
ok
Switched to branch 'master'
OK (2.54s)
    conflict resolution:                                  add conflictor 

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

100%  11 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master e144edf] 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 ecec05f] 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
   e144edf..ecec05f  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 e144edf..ecec05f
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
   e144edf..ecec05f  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 (2.81s)
    conflict resolution (adjusted branch):                add conflictor 

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

100%  11 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master aca2452] 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 06cb873] 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
   aca2452..06cb873  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 aca2452..06cb873
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 b7d9d0e..3d987ec
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
 + b7d9d0e...457594f 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 (4.60s)
    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 71011c0] 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 41abc7a] 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 e9bf873] 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
   71011c0..e9bf873  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 71011c0..e9bf873
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
   21286df..27095a6  git-annex     -> r2/git-annex
   fe1b94a..e9bf873  master        -> r2/master
   71011c0..e9bf873  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 (5.18s)
    conflict resolution (mixed directory and file):       add conflictor 

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

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master f65ae5b] 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 819ec0a] 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
   f65ae5b..819ec0a  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 f65ae5b..819ec0a
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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 341948e] git-annex in .t/tmprepo229
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
add conflictor/subfile 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master a7a8146] 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 058c404] 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
   341948e..058c404  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 341948e..058c404
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 (5.78s)
    conflict resolution symlink bit:                      add conflictor 

100%  10 B              3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master fed3ed9] 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.20191009/test/.t/main2
   cf9b6bf..52f2151  git-annex -> synced/git-annex
   fe1b94a..fed3ed9  master -> synced/master
ok
add conflictor/subfile 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ee8ae8b] 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.20191009/test/.t/main2
   cf9b6bf..52f2151  git-annex        -> origin/git-annex
   cf9b6bf..52f2151  synced/git-annex -> origin/synced/git-annex
   fe1b94a..fed3ed9  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 1e43332] 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.20191009/test/.t/main2
   52f2151..50a8c3f  git-annex -> synced/git-annex
   fed3ed9..1e43332  master -> synced/master
ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master e602bc0] git-annex in .t/tmprepo233
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
pull origin 
From /builddir/build/BUILD/git-annex-7.20191009/test/.t/main2
   cf9b6bf..50a8c3f  git-annex        -> origin/git-annex
   cf9b6bf..50a8c3f  synced/git-annex -> origin/synced/git-annex
   fe1b94a..1e43332  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 f4ea214] 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.20191009/test/.t/main2
   50a8c3f..60796e4  git-annex -> synced/git-annex
   1e43332..f4ea214  master -> synced/master
ok
OK (3.99s)
    conflict resolution (uncommitted local file):         add conflictor 

100%  7 B               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 1dd0d20] 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
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating fe1b94a..1dd0d20
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating fe1b94a..1dd0d20
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               3 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ea01c59] 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 fe1b94a..ea01c59
error: The following untracked working tree files would be overwritten by merge:
	conflictor
Please move or remove them before you merge.
Aborting
Updating fe1b94a..ea01c59
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 (4.75s)
    conflict resolution (removed file):                   add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master cd305db] 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 fe1b94a..cd305db
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 d44cdd9] 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
   cd305db..d44cdd9  master -> synced/master
 * [new branch]      git-annex -> synced/git-annex
ok
commit 
(recording state in git...)
[master 5e0bced] 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 0c98f21] git-annex automatic merge conflict fix
ok
pull r1 
From ../../.t/tmprepo238
   85e11d5..9054cfa  git-annex     -> r1/git-annex
   cd305db..d44cdd9  master        -> r1/master
   cd305db..d44cdd9  synced/master -> r1/synced/master
ok
push r1 
To ../../.t/tmprepo238
   85e11d5..98c7b2e  git-annex -> synced/git-annex
   d44cdd9..0c98f21  master -> synced/master
ok
commit 
On branch master
nothing to commit, working tree clean
ok
merge synced/master 
Updating d44cdd9..0c98f21
Fast-forward
 conflictor.variant-0cbf | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflictor.variant-0cbf
ok
pull r2 
From ../../.t/tmprepo239
   9054cfa..98c7b2e  git-annex     -> r2/git-annex
   cd305db..0c98f21  master        -> r2/master
   d44cdd9..0c98f21  synced/master -> r2/synced/master
ok
add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 4d40af4] 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 fe1b94a..4d40af4
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 ce41a9e] 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
   dcaaee5..56ab2bf  git-annex -> synced/git-annex
   4d40af4..ce41a9e  master -> synced/master
ok
commit 
[master 852e7d5] 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 6ac333f] 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
   ce41a9e..6ac333f  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 ce41a9e..6ac333f
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
   4d40af4..6ac333f  master        -> r1/master
   ce41a9e..6ac333f  synced/master -> r1/synced/master
ok
OK (8.61s)
    conflict resolution (nonannexed file):                add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 8876fc3] git-annex in .t/tmprepo242
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master ea96cf8] 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 f64234a] git-annex automatic merge conflict fix
Already up to date.
ok
push r2 
To ../../.t/tmprepo243
   ea96cf8..f64234a  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 ea96cf8..f64234a
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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master bb820fa] git-annex in .t/tmprepo244
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 3a5a65d] 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 6fe6716] 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
   bb820fa..6fe6716  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 bb820fa..6fe6716
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 (5.55s)
    conflict resolution (nonannexed symlink):             add conflictor 

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 5e13fbb] git-annex in .t/tmprepo246
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master cc2e5af] 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 b43ca90] 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
   cc2e5af..b43ca90  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 cc2e5af..b43ca90
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              4 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master ed083c7] git-annex in .t/tmprepo248
 1 file changed, 1 insertion(+)
 create mode 120000 conflictor
ok
commit 
[master 3a17c1c] 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 eec5358] 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
   ed083c7..eec5358  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 ed083c7..eec5358
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 (4.93s)
    conflict resolution (mixed locked and unlocked file): add conflictor 

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

100%  10 B              4 KiB/s 0s
                                  
ok
(recording state in git...)
unlock conflictor ok
(recording state in git...)
commit 
[master 9e5a0e2] 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 cb519d8] 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
   9e5a0e2..cb519d8  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 9e5a0e2..cb519d8
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
   9e5a0e2..cb519d8  master     -> r2/master
ok
OK (3.52s)
    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.97s)
    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 33da143).
OK (1.05s)
    uninit (in git-annex branch):                         Switched to branch 'git-annex'
git-annex: cannot uninit when the git-annex branch is checked out
OK (0.94s)
    upgrade:                                              upgrade ok
OK (0.70s)
    whereis:                                              whereis foo (1 copy) 
  	b7db5786-18cb-440c-872a-5dd309840c75 -- 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) 
  	fac0bb81-6b9a-4f66-9b85-28220a6d4a37 -- .t/tmprepo256 [here]
  The following untrusted locations may also have copies:
  	b7db5786-18cb-440c-872a-5dd309840c75 -- test repo [origin]
ok
OK (1.10s)
    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 (2.06s)
    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             16 KiB/s 0s
                                  
ok
(recording state in git...)
drop foo ok
(recording state in git...)
move foo (from foo...) 

100%  20 B             42 KiB/s 0s
                                  
(checksum...) ok
(recording state in git...)
git-annex: drop: 1 failed
OK (1.55s)
    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.54s)
    bup remote:                                           OK (0.97s)
    crypto:                                               OK (2.03s)
    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 (2.49s)
    add subdirs:                                          add dir/foo 

100%  24 B             10 KiB/s 0s
                                  
ok
(recording state in git...)
commit 
[master 1a3974b] 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.20191009/test/.t/main2
   60796e4..00405e9  git-annex -> synced/git-annex
   f4ea214..dd53870  master -> synced/master
ok
add ../dir2/foo 

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


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


(to addurlurldest) ok
(recording state in git...)
OK (1.07s)
All 231 tests passed (476.03s)
+ popd
~/build/BUILD/git-annex-7.20191009
+ RPM_EC=0
++ jobs -p
+ exit 0
Processing files: git-annex-7.20191009-1.fc32.aarch64
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.gSfsD3
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191009
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export DOCDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex
+ cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex
+ cp -pr NEWS /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex
+ cp -pr README /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.NYCGf3
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191009
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex
+ export LC_ALL=C
+ LC_ALL=C
+ export LICENSEDIR
+ /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex = 7.20191009-1.fc32 git-annex(aarch-64) = 7.20191009-1.fc32
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) 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.27)(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.20191009-1.fc32.noarch
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.GbJuNZ
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191009
+ DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/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.20191009-1.fc32.aarch64/usr/share/doc/git-annex-docs
+ cp -pr html/ /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/doc/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.mrc6J1
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191009
+ LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/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.20191009-1.fc32.aarch64/usr/share/licenses/git-annex-docs
+ cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex-docs
+ cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64/usr/share/licenses/git-annex-docs
+ RPM_EC=0
++ jobs -p
+ exit 0
Provides: git-annex-docs = 7.20191009-1.fc32
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64
Wrote: /builddir/build/RPMS/git-annex-docs-7.20191009-1.fc32.noarch.rpm
Wrote: /builddir/build/RPMS/git-annex-7.20191009-1.fc32.aarch64.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.Tfs9B1
+ umask 022
+ cd /builddir/build/BUILD
+ cd git-annex-7.20191009
+ /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-7.20191009-1.fc32.aarch64
+ RPM_EC=0
++ jobs -p
+ exit 0
Child return code was: 0