Mock Version: 1.4.16 Mock Version: 1.4.16 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target aarch64 --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f30-build-16668268-1206432/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=172800uid=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;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: aarch64 Building for target aarch64 Wrote: /builddir/build/SRPMS/git-annex-7.20190626-1.fc30.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/f30-build-16668268-1206432/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=172800uid=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;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: aarch64 Building for target aarch64 Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.Ng9QMA + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf git-annex-7.20190626 + /usr/bin/gzip -dc /builddir/build/SOURCES/git-annex-7.20190626.tar.gz + /usr/bin/tar -xof - + STATUS=0 + '[' 0 -ne 0 ']' + cd git-annex-7.20190626 + /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/ + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.mhWI5e + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + 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.2.0.1 + '[' -x Setup ']' + LANG=C.utf8 BUILDSTDERR: ++ 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 BUILDSTDERR: ++ sed -e 's/ / -optc/g' BUILDSTDERR: ++ echo ' -Wl,-z,relro' -Wl,--as-needed BUILDSTDERR: ++ 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.21.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 BUILDSTDERR: checking ssh connection caching...fatal: not a git repository (or any of the parent directories): .git yes Configuring git-annex-7.20190626... + '[' -x Setup ']' + LANG=C.utf8 + ./Setup build Preprocessing executable 'git-annex' for git-annex-7.20190626.. Building executable 'git-annex' for git-annex-7.20190626.. [ 1 of 622] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o ) [ 2 of 622] Compiling Assistant.Types.ThreadName ( Assistant/Types/ThreadName.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.o ) [ 3 of 622] Compiling Assistant.Types.TransferSlots ( Assistant/Types/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.o ) [ 4 of 622] Compiling BuildFlags ( BuildFlags.hs, dist/build/git-annex/git-annex-tmp/BuildFlags.o ) [ 5 of 622] Compiling BuildInfo ( BuildInfo.hs, dist/build/git-annex/git-annex-tmp/BuildInfo.o ) [ 6 of 622] Compiling Build.BundledPrograms ( Build/BundledPrograms.hs, dist/build/git-annex/git-annex-tmp/Build/BundledPrograms.o ) [ 7 of 622] Compiling Config.Cost ( Config/Cost.hs, dist/build/git-annex/git-annex-tmp/Config/Cost.o ) [ 8 of 622] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o ) [ 9 of 622] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o ) [ 10 of 622] Compiling Types.BranchState ( Types/BranchState.hs, dist/build/git-annex/git-annex-tmp/Types/BranchState.o ) [ 11 of 622] Compiling Types.Creds ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o ) [ 12 of 622] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o ) [ 13 of 622] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o ) [ 14 of 622] Compiling Types.Key ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o ) [ 15 of 622] Compiling Types.Mime ( Types/Mime.hs, dist/build/git-annex/git-annex-tmp/Types/Mime.o ) [ 16 of 622] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o ) [ 17 of 622] Compiling Types.WorkerPool ( Types/WorkerPool.hs, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.o ) [ 18 of 622] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o ) [ 19 of 622] Compiling Utility.Bloom ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o ) [ 20 of 622] Compiling Utility.Data ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o ) [ 21 of 622] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o ) [ 22 of 622] Compiling Utility.Dot ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o ) [ 23 of 622] Compiling Utility.Env ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o ) [ 24 of 622] Compiling Utility.Env.Set ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o ) [ 25 of 622] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o ) [ 26 of 622] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o ) [ 27 of 622] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o ) [ 28 of 622] Compiling Build.Mans ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o ) [ 29 of 622] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o ) [ 30 of 622] Compiling Git.FileMode ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o ) [ 31 of 622] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o ) [ 32 of 622] Compiling Utility.Glob ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o ) [ 33 of 622] Compiling Utility.Hash ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o ) [ 34 of 622] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o ) [ 35 of 622] Compiling Utility.HttpManagerRestricted ( Utility/HttpManagerRestricted.hs, dist/build/git-annex/git-annex-tmp/Utility/HttpManagerRestricted.o ) [ 36 of 622] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o ) [ 37 of 622] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o ) [ 38 of 622] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o ) [ 39 of 622] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o ) [ 40 of 622] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o ) [ 41 of 622] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o ) [ 42 of 622] Compiling Utility.Misc ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o ) [ 43 of 622] Compiling Utility.Monad ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o ) [ 44 of 622] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o ) [ 45 of 622] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o ) [ 46 of 622] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o ) [ 47 of 622] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o ) [ 48 of 622] Compiling Types.LockCache ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o ) [ 49 of 622] Compiling Build.Version ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o ) [ 50 of 622] Compiling Utility.Mounts ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o ) [ 51 of 622] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o ) [ 52 of 622] Compiling Utility.PID ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o ) [ 53 of 622] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o ) [ 54 of 622] Compiling Utility.Format ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o ) [ 55 of 622] Compiling Utility.DBus ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o ) [ 56 of 622] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o ) [ 57 of 622] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o ) [ 58 of 622] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o ) [ 59 of 622] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o ) [ 60 of 622] Compiling Utility.Process ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o ) [ 61 of 622] Compiling Utility.Network ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o ) [ 62 of 622] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o ) [ 63 of 622] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o ) [ 64 of 622] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o ) [ 65 of 622] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o ) [ 66 of 622] Compiling Utility.Split ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o ) [ 67 of 622] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o ) [ 68 of 622] Compiling Utility.Shell ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o ) [ 69 of 622] Compiling Git.Types ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o ) [ 70 of 622] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o ) [ 71 of 622] Compiling Utility.Base64 ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o ) [ 72 of 622] Compiling Utility.Aeson ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o ) [ 73 of 622] Compiling Types.Messages ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o ) [ 74 of 622] Compiling Database.Handle ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o ) [ 75 of 622] Compiling Database.Queue ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o ) [ 76 of 622] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o ) [ 77 of 622] Compiling Utility.SshHost ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o ) [ 78 of 622] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o ) [ 79 of 622] Compiling Utility.Tense ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o ) [ 80 of 622] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o ) [ 81 of 622] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o ) [ 82 of 622] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o ) [ 83 of 622] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o ) [ 84 of 622] Compiling Annex.VectorClock ( Annex/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock.o ) [ 85 of 622] Compiling Utility.Tmp ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o ) [ 86 of 622] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o ) [ 87 of 622] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o ) [ 88 of 622] Compiling Utility.Tmp.Dir ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o ) [ 89 of 622] Compiling Utility.Touch ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o ) [ 90 of 622] Compiling Utility.Tuple ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o ) [ 91 of 622] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o ) [ 92 of 622] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o ) [ 93 of 622] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o ) [ 94 of 622] Compiling Utility.Path ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o ) [ 95 of 622] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o ) [ 96 of 622] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o ) [ 97 of 622] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o ) [ 98 of 622] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o ) [ 99 of 622] Compiling Common ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o ) [100 of 622] Compiling Utility.Tor ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o ) [101 of 622] Compiling Utility.TList ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o ) [102 of 622] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o ) [103 of 622] Compiling Utility.Su ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o ) [104 of 622] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o ) [105 of 622] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o ) [106 of 622] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o ) [107 of 622] Compiling Types.UUID ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o ) [108 of 622] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o ) [109 of 622] Compiling Types.NumCopies ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o ) [110 of 622] Compiling Types.Group ( Types/Group.hs, dist/build/git-annex/git-annex-tmp/Types/Group.o ) [111 of 622] Compiling Utility.Parallel ( Utility/Parallel.hs, dist/build/git-annex/git-annex-tmp/Utility/Parallel.o ) [112 of 622] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o ) [113 of 622] Compiling Utility.Metered ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o ) [114 of 622] Compiling Utility.Url ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o ) [115 of 622] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o ) [116 of 622] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o ) [117 of 622] Compiling Utility.Rsync ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o ) [118 of 622] Compiling Utility.Matcher ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o ) [119 of 622] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o ) [120 of 622] Compiling Utility.Lsof ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o ) [121 of 622] Compiling Utility.LogFile ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o ) [122 of 622] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o ) [123 of 622] Compiling Types.KeySource ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o ) [124 of 622] Compiling Types.Backend ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o ) [125 of 622] Compiling Utility.Gpg ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o ) [126 of 622] Compiling Types.Crypto ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o ) [127 of 622] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o ) [128 of 622] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o ) [129 of 622] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o ) [130 of 622] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o ) [131 of 622] Compiling Utility.Daemon ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o ) [132 of 622] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o ) [133 of 622] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o ) [134 of 622] Compiling Utility.Batch ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o ) [135 of 622] Compiling Utility.Android ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o ) [136 of 622] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o ) [137 of 622] Compiling Types.RefSpec ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o ) [138 of 622] Compiling Types.MetaData ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o ) [139 of 622] Compiling Annex.MetaData.StandardFields ( Annex/MetaData/StandardFields.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.o ) [140 of 622] Compiling Logs.Line ( Logs/Line.hs, dist/build/git-annex/git-annex-tmp/Logs/Line.o ) [141 of 622] Compiling Logs.MapLog ( Logs/MapLog.hs, dist/build/git-annex/git-annex-tmp/Logs/MapLog.o ) [142 of 622] Compiling Logs.UUIDBased ( Logs/UUIDBased.hs, dist/build/git-annex/git-annex-tmp/Logs/UUIDBased.o ) [143 of 622] Compiling Key ( Key.hs, dist/build/git-annex/git-annex-tmp/Key.o ) [144 of 622] Compiling Messages.JSON ( Messages/JSON.hs, dist/build/git-annex/git-annex-tmp/Messages/JSON.o ) [145 of 622] Compiling Git.Version ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o ) [146 of 622] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o ) [147 of 622] Compiling Git.Ssh ( Git/Ssh.hs, dist/build/git-annex/git-annex-tmp/Git/Ssh.o ) [148 of 622] Compiling Git.Sha ( Git/Sha.hs, dist/build/git-annex/git-annex-tmp/Git/Sha.o ) [149 of 622] Compiling Git.LockFile ( Git/LockFile.hs, dist/build/git-annex/git-annex-tmp/Git/LockFile.o ) [150 of 622] Compiling Git.Filename ( Git/Filename.hs, dist/build/git-annex/git-annex-tmp/Git/Filename.o ) [151 of 622] Compiling Git ( Git.hs, dist/build/git-annex/git-annex-tmp/Git.o ) [152 of 622] Compiling Git.Url ( Git/Url.hs, dist/build/git-annex/git-annex-tmp/Git/Url.o ) [153 of 622] Compiling Git.Remote ( Git/Remote.hs, dist/build/git-annex/git-annex-tmp/Git/Remote.o ) [154 of 622] Compiling Git.Objects ( Git/Objects.hs, dist/build/git-annex/git-annex-tmp/Git/Objects.o ) [155 of 622] Compiling Git.Index ( Git/Index.hs, dist/build/git-annex/git-annex-tmp/Git/Index.o ) [156 of 622] Compiling Git.Hook ( Git/Hook.hs, dist/build/git-annex/git-annex-tmp/Git/Hook.o ) [157 of 622] Compiling Git.FilePath ( Git/FilePath.hs, dist/build/git-annex/git-annex-tmp/Git/FilePath.o ) [158 of 622] Compiling Types.Export ( Types/Export.hs, dist/build/git-annex/git-annex-tmp/Types/Export.o ) [159 of 622] Compiling Types.Import ( Types/Import.hs, dist/build/git-annex/git-annex-tmp/Types/Import.o ) [160 of 622] Compiling Database.Types ( Database/Types.hs, dist/build/git-annex/git-annex-tmp/Database/Types.o ) [161 of 622] Compiling Git.DiffTreeItem ( Git/DiffTreeItem.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTreeItem.o ) [162 of 622] Compiling Database.Keys.SQL ( Database/Keys/SQL.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/SQL.o ) [163 of 622] Compiling Git.Env ( Git/Env.hs, dist/build/git-annex/git-annex-tmp/Git/Env.o ) [164 of 622] Compiling Git.Command ( Git/Command.hs, dist/build/git-annex/git-annex-tmp/Git/Command.o ) [165 of 622] Compiling Git.UpdateIndex ( Git/UpdateIndex.hs, dist/build/git-annex/git-annex-tmp/Git/UpdateIndex.o ) [166 of 622] Compiling Git.Status ( Git/Status.hs, dist/build/git-annex/git-annex-tmp/Git/Status.o ) [167 of 622] Compiling Git.Remote.Remove ( Git/Remote/Remove.hs, dist/build/git-annex/git-annex-tmp/Git/Remote/Remove.o ) [168 of 622] Compiling Git.RefLog ( Git/RefLog.hs, dist/build/git-annex/git-annex-tmp/Git/RefLog.o ) [169 of 622] Compiling Git.Ref ( Git/Ref.hs, dist/build/git-annex/git-annex-tmp/Git/Ref.o ) [170 of 622] Compiling Git.Queue ( Git/Queue.hs, dist/build/git-annex/git-annex-tmp/Git/Queue.o ) [171 of 622] Compiling Git.LsTree ( Git/LsTree.hs, dist/build/git-annex/git-annex-tmp/Git/LsTree.o ) [172 of 622] Compiling Git.Tree ( Git/Tree.hs, dist/build/git-annex/git-annex-tmp/Git/Tree.o ) [173 of 622] Compiling Git.LsFiles ( Git/LsFiles.hs, dist/build/git-annex/git-annex-tmp/Git/LsFiles.o ) [174 of 622] Compiling Git.History ( Git/History.hs, dist/build/git-annex/git-annex-tmp/Git/History.o ) [175 of 622] Compiling Git.HashObject ( Git/HashObject.hs, dist/build/git-annex/git-annex-tmp/Git/HashObject.o ) [176 of 622] Compiling Git.Fsck ( Git/Fsck.hs, dist/build/git-annex/git-annex-tmp/Git/Fsck.o ) [177 of 622] Compiling Git.DiffTree ( Git/DiffTree.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTree.o ) [178 of 622] Compiling Git.Command.Batch ( Git/Command/Batch.hs, dist/build/git-annex/git-annex-tmp/Git/Command/Batch.o ) [179 of 622] Compiling Git.CheckIgnore ( Git/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Git/CheckIgnore.o ) [180 of 622] Compiling Git.CheckAttr ( Git/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Git/CheckAttr.o ) [181 of 622] Compiling Git.CatFile ( Git/CatFile.hs, dist/build/git-annex/git-annex-tmp/Git/CatFile.o ) [182 of 622] Compiling Git.UnionMerge ( Git/UnionMerge.hs, dist/build/git-annex/git-annex-tmp/Git/UnionMerge.o ) [183 of 622] Compiling Annex.AdjustedBranch.Name ( Annex/AdjustedBranch/Name.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch/Name.o ) [184 of 622] Compiling Config.DynamicConfig ( Config/DynamicConfig.hs, dist/build/git-annex/git-annex-tmp/Config/DynamicConfig.o ) [185 of 622] Compiling Annex.Magic ( Annex/Magic.hs, dist/build/git-annex/git-annex-tmp/Annex/Magic.o ) [186 of 622] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o ) [187 of 622] Compiling Build.Configure ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o ) [188 of 622] Compiling Utility.OSX ( Utility/OSX.hs, dist/build/git-annex/git-annex-tmp/Utility/OSX.o ) [189 of 622] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, dist/build/git-annex/git-annex-tmp/Utility/FreeDesktop.o ) [190 of 622] Compiling Config.Files ( Config/Files.hs, dist/build/git-annex/git-annex-tmp/Config/Files.o ) [191 of 622] Compiling Annex.Path ( Annex/Path.hs, dist/build/git-annex/git-annex-tmp/Annex/Path.o ) [192 of 622] Compiling Annex.Multicast ( Annex/Multicast.hs, dist/build/git-annex/git-annex-tmp/Annex/Multicast.o ) [193 of 622] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/Menu.o ) [194 of 622] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/AutoStart.o ) [195 of 622] Compiling Build.DesktopFile ( Build/DesktopFile.hs, dist/build/git-annex/git-annex-tmp/Build/DesktopFile.o ) [196 of 622] Compiling Git.Construct ( Git/Construct.hs, dist/build/git-annex/git-annex-tmp/Git/Construct.o ) [197 of 622] Compiling Git.Config ( Git/Config.hs, dist/build/git-annex/git-annex-tmp/Git/Config.o ) [198 of 622] Compiling Types.Distribution ( Types/Distribution.hs, dist/build/git-annex/git-annex-tmp/Types/Distribution.o ) [199 of 622] Compiling Types.Difference ( Types/Difference.hs, dist/build/git-annex/git-annex-tmp/Types/Difference.o ) [200 of 622] Compiling Git.GCrypt ( Git/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Git/GCrypt.o ) [201 of 622] Compiling Git.CurrentRepo ( Git/CurrentRepo.hs, dist/build/git-annex/git-annex-tmp/Git/CurrentRepo.o ) [202 of 622] Compiling Git.ConfigTypes ( Git/ConfigTypes.hs, dist/build/git-annex/git-annex-tmp/Git/ConfigTypes.o ) [203 of 622] Compiling Types.GitConfig ( Types/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Types/GitConfig.o ) [204 of 622] Compiling Types.Remote ( Types/Remote.hs, dist/build/git-annex/git-annex-tmp/Types/Remote.o ) [205 of 622] Compiling Types.StandardGroups ( Types/StandardGroups.hs, dist/build/git-annex/git-annex-tmp/Types/StandardGroups.o ) [206 of 622] Compiling Annex.DirHashes ( Annex/DirHashes.hs, dist/build/git-annex/git-annex-tmp/Annex/DirHashes.o ) [207 of 622] Compiling Git.Branch ( Git/Branch.hs, dist/build/git-annex/git-annex-tmp/Git/Branch.o ) [208 of 622] Compiling Git.Repair ( Git/Repair.hs, dist/build/git-annex/git-annex-tmp/Git/Repair.o ) [209 of 622] Compiling Git.Merge ( Git/Merge.hs, dist/build/git-annex/git-annex-tmp/Git/Merge.o ) [210 of 622] Compiling Git.AutoCorrect ( Git/AutoCorrect.hs, dist/build/git-annex/git-annex-tmp/Git/AutoCorrect.o ) [211 of 622] Compiling Annex.Fixup ( Annex/Fixup.hs, dist/build/git-annex/git-annex-tmp/Annex/Fixup.o ) [212 of 622] Compiling Annex.Locations ( Annex/Locations.hs, dist/build/git-annex/git-annex-tmp/Annex/Locations.o ) [213 of 622] Compiling Annex ( Annex.hs, dist/build/git-annex/git-annex-tmp/Annex.o ) [214 of 622] Compiling Types.DeferredParse ( Types/DeferredParse.hs, dist/build/git-annex/git-annex-tmp/Types/DeferredParse.o ) [215 of 622] Compiling Types ( Types.hs, dist/build/git-annex/git-annex-tmp/Types.o ) [216 of 622] Compiling Types.Transfer ( Types/Transfer.hs, dist/build/git-annex/git-annex-tmp/Types/Transfer.o ) [217 of 622] Compiling Types.ActionItem ( Types/ActionItem.hs, dist/build/git-annex/git-annex-tmp/Types/ActionItem.o ) [218 of 622] Compiling Types.Command ( Types/Command.hs, dist/build/git-annex/git-annex-tmp/Types/Command.o ) [219 of 622] Compiling Types.Test ( Types/Test.hs, dist/build/git-annex/git-annex-tmp/Types/Test.o ) [220 of 622] Compiling Types.Benchmark ( Types/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Types/Benchmark.o ) [221 of 622] Compiling Remote.WebDAV.DavLocation ( Remote/WebDAV/DavLocation.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV/DavLocation.o ) [222 of 622] Compiling Remote.Rsync.RsyncUrl ( Remote/Rsync/RsyncUrl.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync/RsyncUrl.o ) [223 of 622] Compiling Assistant.Types.RepoProblem ( Assistant/Types/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RepoProblem.o ) [224 of 622] Compiling Messages.Concurrent ( Messages/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Messages/Concurrent.o ) [225 of 622] Compiling Messages.Internal ( Messages/Internal.hs, dist/build/git-annex/git-annex-tmp/Messages/Internal.o ) [226 of 622] Compiling Messages ( Messages.hs, dist/build/git-annex/git-annex-tmp/Messages.o ) [227 of 622] Compiling Messages.Progress ( Messages/Progress.hs, dist/build/git-annex/git-annex-tmp/Messages/Progress.o ) [228 of 622] Compiling CmdLine.GlobalSetter ( CmdLine/GlobalSetter.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GlobalSetter.o ) [229 of 622] Compiling Annex.LockPool.PosixOrPid ( Annex/LockPool/PosixOrPid.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool/PosixOrPid.o ) [230 of 622] Compiling Annex.LockPool ( Annex/LockPool.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool.o ) [231 of 622] Compiling Annex.Common ( Annex/Common.hs, dist/build/git-annex/git-annex-tmp/Annex/Common.o ) [232 of 622] Compiling Types.View ( Types/View.hs, dist/build/git-annex/git-annex-tmp/Types/View.o ) [233 of 622] Compiling Types.StoreRetrieve ( Types/StoreRetrieve.hs, dist/build/git-annex/git-annex-tmp/Types/StoreRetrieve.o ) [234 of 622] Compiling Remote.Helper.ReadOnly ( Remote/Helper/ReadOnly.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ReadOnly.o ) [235 of 622] Compiling Remote.Helper.Messages ( Remote/Helper/Messages.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Messages.o ) [236 of 622] Compiling Remote.Helper.Git ( Remote/Helper/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Git.o ) [237 of 622] Compiling Remote.External.Types ( Remote/External/Types.hs, dist/build/git-annex/git-annex-tmp/Remote/External/Types.o ) [238 of 622] Compiling Logs.Trust.Pure ( Logs/Trust/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Pure.o ) [239 of 622] Compiling Logs.Transitions ( Logs/Transitions.hs, dist/build/git-annex/git-annex-tmp/Logs/Transitions.o ) [240 of 622] Compiling Logs.SingleValue.Pure ( Logs/SingleValue/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue/Pure.o ) [241 of 622] Compiling Logs.MetaData.Pure ( Logs/MetaData/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData/Pure.o ) [242 of 622] Compiling Logs.Presence.Pure ( Logs/Presence/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence/Pure.o ) [243 of 622] Compiling Logs.Difference.Pure ( Logs/Difference/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference/Pure.o ) [244 of 622] Compiling Logs.ContentIdentifier.Pure ( Logs/ContentIdentifier/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier/Pure.o ) [245 of 622] Compiling Logs.Chunk.Pure ( Logs/Chunk/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk/Pure.o ) [246 of 622] Compiling Logs ( Logs.hs, dist/build/git-annex/git-annex-tmp/Logs.o ) [247 of 622] Compiling Annex.Branch.Transitions ( Annex/Branch/Transitions.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch/Transitions.o ) [248 of 622] Compiling Crypto ( Crypto.hs, dist/build/git-annex/git-annex-tmp/Crypto.o ) [249 of 622] Compiling Config ( Config.hs, dist/build/git-annex/git-annex-tmp/Config.o ) [250 of 622] Compiling Remote.Helper.Encryptable ( Remote/Helper/Encryptable.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Encryptable.o ) [251 of 622] Compiling Config.Smudge ( Config/Smudge.hs, dist/build/git-annex/git-annex-tmp/Config/Smudge.o ) [252 of 622] Compiling CmdLine.Usage ( CmdLine/Usage.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Usage.o ) [253 of 622] Compiling CmdLine.Option ( CmdLine/Option.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Option.o ) [254 of 622] Compiling CmdLine.GitAnnexShell.Fields ( CmdLine/GitAnnexShell/Fields.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Fields.o ) [255 of 622] Compiling Backend.Utilities ( Backend/Utilities.hs, dist/build/git-annex/git-annex-tmp/Backend/Utilities.o ) [256 of 622] Compiling Backend.WORM ( Backend/WORM.hs, dist/build/git-annex/git-annex-tmp/Backend/WORM.o ) [257 of 622] Compiling Backend.URL ( Backend/URL.hs, dist/build/git-annex/git-annex-tmp/Backend/URL.o ) [258 of 622] Compiling Backend.Hash ( Backend/Hash.hs, dist/build/git-annex/git-annex-tmp/Backend/Hash.o ) [259 of 622] Compiling Assistant.Types.TransferQueue ( Assistant/Types/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferQueue.o ) [260 of 622] Compiling Assistant.Types.ThreadedMonad ( Assistant/Types/ThreadedMonad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadedMonad.o ) [261 of 622] Compiling Assistant.Types.ScanRemotes ( Assistant/Types/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ScanRemotes.o ) [262 of 622] Compiling Assistant.Types.Pushes ( Assistant/Types/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Pushes.o ) [263 of 622] Compiling Assistant.Ssh ( Assistant/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/Ssh.o ) [264 of 622] Compiling Assistant.Alert.Utility ( Assistant/Alert/Utility.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert/Utility.o ) [265 of 622] Compiling Annex.View.ViewedFile ( Annex/View/ViewedFile.hs, dist/build/git-annex/git-annex-tmp/Annex/View/ViewedFile.o ) [266 of 622] Compiling Annex.Version ( Annex/Version.hs, dist/build/git-annex/git-annex-tmp/Annex/Version.o ) [267 of 622] Compiling Annex.VariantFile ( Annex/VariantFile.hs, dist/build/git-annex/git-annex-tmp/Annex/VariantFile.o ) [268 of 622] Compiling Annex.Url ( Annex/Url.hs, dist/build/git-annex/git-annex-tmp/Annex/Url.o ) [269 of 622] Compiling Annex.UUID ( Annex/UUID.hs, dist/build/git-annex/git-annex-tmp/Annex/UUID.o ) [270 of 622] Compiling Annex.Perms ( Annex/Perms.hs, dist/build/git-annex/git-annex-tmp/Annex/Perms.o ) [271 of 622] Compiling Database.Init ( Database/Init.hs, dist/build/git-annex/git-annex-tmp/Database/Init.o ) [272 of 622] Compiling Creds ( Creds.hs, dist/build/git-annex/git-annex-tmp/Creds.o ) [273 of 622] Compiling Remote.Helper.AWS ( Remote/Helper/AWS.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/AWS.o ) [274 of 622] Compiling P2P.Address ( P2P/Address.hs, dist/build/git-annex/git-annex-tmp/P2P/Address.o ) [275 of 622] Compiling P2P.Auth ( P2P/Auth.hs, dist/build/git-annex/git-annex-tmp/P2P/Auth.o ) [276 of 622] Compiling Annex.Notification ( Annex/Notification.hs, dist/build/git-annex/git-annex-tmp/Annex/Notification.o ) [277 of 622] Compiling Annex.LockFile ( Annex/LockFile.hs, dist/build/git-annex/git-annex-tmp/Annex/LockFile.o ) [278 of 622] Compiling Remote.Helper.Hooks ( Remote/Helper/Hooks.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Hooks.o ) [279 of 622] Compiling Database.Fsck ( Database/Fsck.hs, dist/build/git-annex/git-annex-tmp/Database/Fsck.o ) [280 of 622] Compiling Annex.Tmp ( Annex/Tmp.hs, dist/build/git-annex/git-annex-tmp/Annex/Tmp.o ) [281 of 622] Compiling Annex.ReplaceFile ( Annex/ReplaceFile.hs, dist/build/git-annex/git-annex-tmp/Annex/ReplaceFile.o ) [282 of 622] Compiling Logs.File ( Logs/File.hs, dist/build/git-annex/git-annex-tmp/Logs/File.o ) [283 of 622] Compiling Logs.View ( Logs/View.hs, dist/build/git-annex/git-annex-tmp/Logs/View.o ) [284 of 622] Compiling Logs.Unused ( Logs/Unused.hs, dist/build/git-annex/git-annex-tmp/Logs/Unused.o ) [285 of 622] Compiling Logs.Transfer ( Logs/Transfer.hs, dist/build/git-annex/git-annex-tmp/Logs/Transfer.o ) [286 of 622] Compiling Logs.Smudge ( Logs/Smudge.hs, dist/build/git-annex/git-annex-tmp/Logs/Smudge.o ) [287 of 622] Compiling Logs.FsckResults ( Logs/FsckResults.hs, dist/build/git-annex/git-annex-tmp/Logs/FsckResults.o ) [288 of 622] Compiling Annex.Ssh ( Annex/Ssh.hs, dist/build/git-annex/git-annex-tmp/Annex/Ssh.o ) [289 of 622] Compiling Annex.Queue ( Annex/Queue.hs, dist/build/git-annex/git-annex-tmp/Annex/Queue.o ) [290 of 622] Compiling Annex.Journal ( Annex/Journal.hs, dist/build/git-annex/git-annex-tmp/Annex/Journal.o ) [291 of 622] Compiling Annex.InodeSentinal ( Annex/InodeSentinal.hs, dist/build/git-annex/git-annex-tmp/Annex/InodeSentinal.o ) [292 of 622] Compiling Annex.Hook ( Annex/Hook.hs, dist/build/git-annex/git-annex-tmp/Annex/Hook.o ) [293 of 622] Compiling Upgrade.V6 ( Upgrade/V6.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V6.o ) [294 of 622] Compiling Annex.HashObject ( Annex/HashObject.hs, dist/build/git-annex/git-annex-tmp/Annex/HashObject.o ) [295 of 622] Compiling Annex.Link ( Annex/Link.hs, dist/build/git-annex/git-annex-tmp/Annex/Link.o ) [296 of 622] Compiling Annex.GitOverlay ( Annex/GitOverlay.hs, dist/build/git-annex/git-annex-tmp/Annex/GitOverlay.o ) [297 of 622] Compiling Annex.CurrentBranch ( Annex/CurrentBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/CurrentBranch.o ) [298 of 622] Compiling Annex.Content.LowLevel ( Annex/Content/LowLevel.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/LowLevel.o ) [299 of 622] Compiling Annex.Content.PointerFile ( Annex/Content/PointerFile.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/PointerFile.o ) [300 of 622] Compiling Annex.ChangedRefs ( Annex/ChangedRefs.hs, dist/build/git-annex/git-annex-tmp/Annex/ChangedRefs.o ) [301 of 622] Compiling RemoteDaemon.Types ( RemoteDaemon/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Types.o ) [302 of 622] Compiling Assistant.Types.RemoteControl ( Assistant/Types/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RemoteControl.o ) [303 of 622] Compiling RemoteDaemon.Transport.Ssh.Types ( RemoteDaemon/Transport/Ssh/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh/Types.o ) [304 of 622] Compiling P2P.Protocol ( P2P/Protocol.hs, dist/build/git-annex/git-annex-tmp/P2P/Protocol.o ) [305 of 622] Compiling P2P.IO ( P2P/IO.hs, dist/build/git-annex/git-annex-tmp/P2P/IO.o ) [306 of 622] Compiling CmdLine.GitRemoteTorAnnex ( CmdLine/GitRemoteTorAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitRemoteTorAnnex.o ) [307 of 622] Compiling Annex.CheckIgnore ( Annex/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckIgnore.o ) [308 of 622] Compiling Annex.CheckAttr ( Annex/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckAttr.o ) [309 of 622] Compiling Backend ( Backend.hs, dist/build/git-annex/git-annex-tmp/Backend.o ) [310 of 622] Compiling Annex.CatFile ( Annex/CatFile.hs, dist/build/git-annex/git-annex-tmp/Annex/CatFile.o ) [311 of 622] Compiling RemoteDaemon.Common ( RemoteDaemon/Common.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Common.o ) [312 of 622] Compiling Database.Keys ( Database/Keys.hs, dist/build/git-annex/git-annex-tmp/Database/Keys.o ) [313 of 622] Compiling Annex.RemoteTrackingBranch ( Annex/RemoteTrackingBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/RemoteTrackingBranch.o ) [314 of 622] Compiling Annex.Export ( Annex/Export.hs, dist/build/git-annex/git-annex-tmp/Annex/Export.o ) [315 of 622] Compiling Annex.Concurrent ( Annex/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Annex/Concurrent.o ) [316 of 622] Compiling Annex.Transfer ( Annex/Transfer.hs, dist/build/git-annex/git-annex-tmp/Annex/Transfer.o ) [317 of 622] Compiling Annex.BranchState ( Annex/BranchState.hs, dist/build/git-annex/git-annex-tmp/Annex/BranchState.o ) [318 of 622] Compiling Annex.Branch ( Annex/Branch.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch.o ) [319 of 622] Compiling Logs.UUID ( Logs/UUID.hs, dist/build/git-annex/git-annex-tmp/Logs/UUID.o ) [320 of 622] Compiling Logs.Trust.Basic ( Logs/Trust/Basic.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Basic.o ) [321 of 622] Compiling Logs.SingleValue ( Logs/SingleValue.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue.o ) [322 of 622] Compiling Logs.NumCopies ( Logs/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Logs/NumCopies.o ) [323 of 622] Compiling Logs.Schedule ( Logs/Schedule.hs, dist/build/git-annex/git-annex-tmp/Logs/Schedule.o ) [324 of 622] Compiling Logs.RemoteState ( Logs/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Logs/RemoteState.o ) [325 of 622] Compiling Logs.Remote ( Logs/Remote.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote.o ) [326 of 622] Compiling Logs.Presence ( Logs/Presence.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence.o ) [327 of 622] Compiling Logs.PreferredContent.Raw ( Logs/PreferredContent/Raw.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent/Raw.o ) [328 of 622] Compiling Logs.Multicast ( Logs/Multicast.hs, dist/build/git-annex/git-annex-tmp/Logs/Multicast.o ) [329 of 622] Compiling Logs.MetaData ( Logs/MetaData.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData.o ) [330 of 622] Compiling Annex.MetaData ( Annex/MetaData.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData.o ) [331 of 622] Compiling Logs.Location ( Logs/Location.hs, dist/build/git-annex/git-annex-tmp/Logs/Location.o ) [332 of 622] Compiling Logs.Web ( Logs/Web.hs, dist/build/git-annex/git-annex-tmp/Logs/Web.o ) [333 of 622] Compiling Annex.Content.Direct ( Annex/Content/Direct.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/Direct.o ) [334 of 622] Compiling Logs.Group ( Logs/Group.hs, dist/build/git-annex/git-annex-tmp/Logs/Group.o ) [335 of 622] Compiling Logs.Export ( Logs/Export.hs, dist/build/git-annex/git-annex-tmp/Logs/Export.o ) [336 of 622] Compiling Database.Export ( Database/Export.hs, dist/build/git-annex/git-annex-tmp/Database/Export.o ) [337 of 622] Compiling Logs.Difference ( Logs/Difference.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference.o ) [338 of 622] Compiling Annex.Difference ( Annex/Difference.hs, dist/build/git-annex/git-annex-tmp/Annex/Difference.o ) [339 of 622] Compiling Logs.ContentIdentifier ( Logs/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier.o ) [340 of 622] Compiling Logs.Config ( Logs/Config.hs, dist/build/git-annex/git-annex-tmp/Logs/Config.o ) [341 of 622] Compiling Config.GitConfig ( Config/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Config/GitConfig.o ) [342 of 622] Compiling Logs.Chunk ( Logs/Chunk.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk.o ) [343 of 622] Compiling Remote.Helper.Chunked ( Remote/Helper/Chunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked.o ) [344 of 622] Compiling Remote.Helper.Chunked.Legacy ( Remote/Helper/Chunked/Legacy.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked/Legacy.o ) [345 of 622] Compiling Logs.Activity ( Logs/Activity.hs, dist/build/git-annex/git-annex-tmp/Logs/Activity.o ) [346 of 622] Compiling Database.ContentIdentifier ( Database/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Database/ContentIdentifier.o ) [347 of 622] Compiling Remote.Helper.ExportImport ( Remote/Helper/ExportImport.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ExportImport.o ) [348 of 622] Compiling Remote.BitTorrent ( Remote/BitTorrent.hs, dist/build/git-annex/git-annex-tmp/Remote/BitTorrent.o ) [349 of 622] Compiling Annex.Content ( Annex/Content.hs, dist/build/git-annex/git-annex-tmp/Annex/Content.o ) [350 of 622] Compiling Upgrade.V2 ( Upgrade/V2.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V2.o ) [351 of 622] Compiling Upgrade.V1 ( Upgrade/V1.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V1.o ) [352 of 622] Compiling Upgrade.V0 ( Upgrade/V0.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V0.o ) [353 of 622] Compiling Remote.Helper.Special ( Remote/Helper/Special.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Special.o ) [354 of 622] Compiling Remote.Tahoe ( Remote/Tahoe.hs, dist/build/git-annex/git-annex-tmp/Remote/Tahoe.o ) [355 of 622] Compiling Remote.Rsync ( Remote/Rsync.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync.o ) [356 of 622] Compiling Remote.Hook ( Remote/Hook.hs, dist/build/git-annex/git-annex-tmp/Remote/Hook.o ) [357 of 622] Compiling Remote.Helper.Http ( Remote/Helper/Http.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Http.o ) [358 of 622] Compiling Remote.WebDAV ( Remote/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV.o ) [359 of 622] Compiling Remote.S3 ( Remote/S3.hs, dist/build/git-annex/git-annex-tmp/Remote/S3.o ) [360 of 622] Compiling Remote.Glacier ( Remote/Glacier.hs, dist/build/git-annex/git-annex-tmp/Remote/Glacier.o ) [361 of 622] Compiling Remote.Directory.LegacyChunked ( Remote/Directory/LegacyChunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory/LegacyChunked.o ) [362 of 622] Compiling Remote.Ddar ( Remote/Ddar.hs, dist/build/git-annex/git-annex-tmp/Remote/Ddar.o ) [363 of 622] Compiling Remote.Adb ( Remote/Adb.hs, dist/build/git-annex/git-annex-tmp/Remote/Adb.o ) [364 of 622] Compiling Remote.Helper.P2P ( Remote/Helper/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/P2P.o ) [365 of 622] Compiling Remote.External ( Remote/External.hs, dist/build/git-annex/git-annex-tmp/Remote/External.o ) [366 of 622] Compiling Remote.Directory ( Remote/Directory.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory.o ) [367 of 622] Compiling P2P.Annex ( P2P/Annex.hs, dist/build/git-annex/git-annex-tmp/P2P/Annex.o ) [368 of 622] Compiling RemoteDaemon.Transport.Tor ( RemoteDaemon/Transport/Tor.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Tor.o ) [369 of 622] Compiling Remote.P2P ( Remote/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/P2P.o ) [370 of 622] Compiling Remote.Helper.Ssh ( Remote/Helper/Ssh.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Ssh.o ) [371 of 622] Compiling RemoteDaemon.Transport.Ssh ( RemoteDaemon/Transport/Ssh.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh.o ) [372 of 622] Compiling Remote.GCrypt ( Remote/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Remote/GCrypt.o ) [373 of 622] Compiling RemoteDaemon.Transport.GCrypt ( RemoteDaemon/Transport/GCrypt.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/GCrypt.o ) [374 of 622] Compiling RemoteDaemon.Transport ( RemoteDaemon/Transport.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport.o ) [375 of 622] Compiling RemoteDaemon.Core ( RemoteDaemon/Core.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Core.o ) [376 of 622] Compiling Remote.Bup ( Remote/Bup.hs, dist/build/git-annex/git-annex-tmp/Remote/Bup.o ) [377 of 622] Compiling Annex.YoutubeDl ( Annex/YoutubeDl.hs, dist/build/git-annex/git-annex-tmp/Annex/YoutubeDl.o ) [378 of 622] Compiling Remote.Web ( Remote/Web.hs, dist/build/git-annex/git-annex-tmp/Remote/Web.o ) [379 of 622] Compiling Annex.WorkTree ( Annex/WorkTree.hs, dist/build/git-annex/git-annex-tmp/Annex/WorkTree.o ) [380 of 622] Compiling Annex.Direct ( Annex/Direct.hs, dist/build/git-annex/git-annex-tmp/Annex/Direct.o ) [381 of 622] Compiling Upgrade.V4 ( Upgrade/V4.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V4.o ) [382 of 622] Compiling Upgrade.V3 ( Upgrade/V3.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V3.o ) [383 of 622] Compiling Annex.AutoMerge ( Annex/AutoMerge.hs, dist/build/git-annex/git-annex-tmp/Annex/AutoMerge.o ) [384 of 622] Compiling Annex.BloomFilter ( Annex/BloomFilter.hs, dist/build/git-annex/git-annex-tmp/Annex/BloomFilter.o ) [385 of 622] Compiling Annex.AdjustedBranch ( Annex/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch.o ) [386 of 622] Compiling Upgrade.V5 ( Upgrade/V5.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5.o ) [387 of 622] Compiling Upgrade ( Upgrade.hs, dist/build/git-annex/git-annex-tmp/Upgrade.o ) [388 of 622] Compiling Annex.UpdateInstead ( Annex/UpdateInstead.hs, dist/build/git-annex/git-annex-tmp/Annex/UpdateInstead.o ) [389 of 622] Compiling Annex.Ingest ( Annex/Ingest.hs, dist/build/git-annex/git-annex-tmp/Annex/Ingest.o ) [390 of 622] Compiling Assistant.Types.Changes ( Assistant/Types/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Changes.o ) [391 of 622] Compiling Annex.Action ( Annex/Action.hs, dist/build/git-annex/git-annex-tmp/Annex/Action.o ) [392 of 622] Compiling Assistant.Gpg ( Assistant/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/Gpg.o ) [393 of 622] Compiling Annex.Environment ( Annex/Environment.hs, dist/build/git-annex/git-annex-tmp/Annex/Environment.o ) [394 of 622] Compiling Annex.Init ( Annex/Init.hs, dist/build/git-annex/git-annex-tmp/Annex/Init.o ) [395 of 622] Compiling Remote.Git ( Remote/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Git.o ) [396 of 622] Compiling Remote.List ( Remote/List.hs, dist/build/git-annex/git-annex-tmp/Remote/List.o ) [397 of 622] Compiling Logs.Trust ( Logs/Trust.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust.o ) [398 of 622] Compiling Remote ( Remote.hs, dist/build/git-annex/git-annex-tmp/Remote.o ) [399 of 622] Compiling Assistant.WebApp.RepoId ( Assistant/WebApp/RepoId.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoId.o ) [400 of 622] Compiling Annex.TaggedPush ( Annex/TaggedPush.hs, dist/build/git-annex/git-annex-tmp/Annex/TaggedPush.o ) [401 of 622] Compiling Annex.SpecialRemote ( Annex/SpecialRemote.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote.o ) [402 of 622] Compiling Annex.NumCopies ( Annex/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Annex/NumCopies.o ) [403 of 622] Compiling Limit ( Limit.hs, dist/build/git-annex/git-annex-tmp/Limit.o ) [404 of 622] Compiling Annex.FileMatcher ( Annex/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Annex/FileMatcher.o ) [405 of 622] Compiling Logs.PreferredContent ( Logs/PreferredContent.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent.o ) [406 of 622] Compiling Annex.Wanted ( Annex/Wanted.hs, dist/build/git-annex/git-annex-tmp/Annex/Wanted.o ) [407 of 622] Compiling Limit.Wanted ( Limit/Wanted.hs, dist/build/git-annex/git-annex-tmp/Limit/Wanted.o ) [408 of 622] Compiling CmdLine.GitAnnex.Options ( CmdLine/GitAnnex/Options.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex/Options.o ) [409 of 622] Compiling CmdLine.Seek ( CmdLine/Seek.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Seek.o ) [410 of 622] Compiling CmdLine.Action ( CmdLine/Action.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Action.o ) [411 of 622] Compiling CmdLine.Batch ( CmdLine/Batch.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Batch.o ) [412 of 622] Compiling Annex.View ( Annex/View.hs, dist/build/git-annex/git-annex-tmp/Annex/View.o ) [413 of 622] Compiling Command ( Command.hs, dist/build/git-annex/git-annex-tmp/Command.o ) [414 of 622] Compiling Command.Whereis ( Command/Whereis.hs, dist/build/git-annex/git-annex-tmp/Command/Whereis.o ) [415 of 622] Compiling Command.Wanted ( Command/Wanted.hs, dist/build/git-annex/git-annex-tmp/Command/Wanted.o ) [416 of 622] Compiling Command.View ( Command/View.hs, dist/build/git-annex/git-annex-tmp/Command/View.o ) [417 of 622] Compiling Command.Vicfg ( Command/Vicfg.hs, dist/build/git-annex/git-annex-tmp/Command/Vicfg.o ) [418 of 622] Compiling Command.Version ( Command/Version.hs, dist/build/git-annex/git-annex-tmp/Command/Version.o ) [419 of 622] Compiling Command.VPop ( Command/VPop.hs, dist/build/git-annex/git-annex-tmp/Command/VPop.o ) [420 of 622] Compiling Command.VFilter ( Command/VFilter.hs, dist/build/git-annex/git-annex-tmp/Command/VFilter.o ) [421 of 622] Compiling Command.VCycle ( Command/VCycle.hs, dist/build/git-annex/git-annex-tmp/Command/VCycle.o ) [422 of 622] Compiling Command.VAdd ( Command/VAdd.hs, dist/build/git-annex/git-annex-tmp/Command/VAdd.o ) [423 of 622] Compiling Command.Upgrade ( Command/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Command/Upgrade.o ) [424 of 622] Compiling Command.Unused ( Command/Unused.hs, dist/build/git-annex/git-annex-tmp/Command/Unused.o ) [425 of 622] Compiling Command.Unlock ( Command/Unlock.hs, dist/build/git-annex/git-annex-tmp/Command/Unlock.o ) [426 of 622] Compiling Command.Ungroup ( Command/Ungroup.hs, dist/build/git-annex/git-annex-tmp/Command/Ungroup.o ) [427 of 622] Compiling Command.Trust ( Command/Trust.hs, dist/build/git-annex/git-annex-tmp/Command/Trust.o ) [428 of 622] Compiling Command.Untrust ( Command/Untrust.hs, dist/build/git-annex/git-annex-tmp/Command/Untrust.o ) [429 of 622] Compiling Command.TransferKeys ( Command/TransferKeys.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKeys.o ) [430 of 622] Compiling Command.TransferKey ( Command/TransferKey.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKey.o ) [431 of 622] Compiling Command.TransferInfo ( Command/TransferInfo.hs, dist/build/git-annex/git-annex-tmp/Command/TransferInfo.o ) [432 of 622] Compiling Command.TestRemote ( Command/TestRemote.hs, dist/build/git-annex/git-annex-tmp/Command/TestRemote.o ) [433 of 622] Compiling Command.Test ( Command/Test.hs, dist/build/git-annex/git-annex-tmp/Command/Test.o ) [434 of 622] Compiling Command.Status ( Command/Status.hs, dist/build/git-annex/git-annex-tmp/Command/Status.o ) [435 of 622] Compiling Command.Smudge ( Command/Smudge.hs, dist/build/git-annex/git-annex-tmp/Command/Smudge.o ) [436 of 622] Compiling Command.SetPresentKey ( Command/SetPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetPresentKey.o ) [437 of 622] Compiling Command.SetKey ( Command/SetKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetKey.o ) [438 of 622] Compiling Command.SendKey ( Command/SendKey.hs, dist/build/git-annex/git-annex-tmp/Command/SendKey.o ) [439 of 622] Compiling Command.Semitrust ( Command/Semitrust.hs, dist/build/git-annex/git-annex-tmp/Command/Semitrust.o ) [440 of 622] Compiling Command.Schedule ( Command/Schedule.hs, dist/build/git-annex/git-annex-tmp/Command/Schedule.o ) [441 of 622] Compiling Command.RmUrl ( Command/RmUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RmUrl.o ) [442 of 622] Compiling Command.ResolveMerge ( Command/ResolveMerge.hs, dist/build/git-annex/git-annex-tmp/Command/ResolveMerge.o ) [443 of 622] Compiling Command.Required ( Command/Required.hs, dist/build/git-annex/git-annex-tmp/Command/Required.o ) [444 of 622] Compiling Command.Repair ( Command/Repair.hs, dist/build/git-annex/git-annex-tmp/Command/Repair.o ) [445 of 622] Compiling Command.RenameRemote ( Command/RenameRemote.hs, dist/build/git-annex/git-annex-tmp/Command/RenameRemote.o ) [446 of 622] Compiling Command.RemoteDaemon ( Command/RemoteDaemon.hs, dist/build/git-annex/git-annex-tmp/Command/RemoteDaemon.o ) [447 of 622] Compiling Command.Reinject ( Command/Reinject.hs, dist/build/git-annex/git-annex-tmp/Command/Reinject.o ) [448 of 622] Compiling Command.Reinit ( Command/Reinit.hs, dist/build/git-annex/git-annex-tmp/Command/Reinit.o ) [449 of 622] Compiling Command.RecvKey ( Command/RecvKey.hs, dist/build/git-annex/git-annex-tmp/Command/RecvKey.o ) [450 of 622] Compiling Command.ReadPresentKey ( Command/ReadPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReadPresentKey.o ) [451 of 622] Compiling Command.ReKey ( Command/ReKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReKey.o ) [452 of 622] Compiling Command.Proxy ( Command/Proxy.hs, dist/build/git-annex/git-annex-tmp/Command/Proxy.o ) [453 of 622] Compiling Command.P2P ( Command/P2P.hs, dist/build/git-annex/git-annex-tmp/Command/P2P.o ) [454 of 622] Compiling Command.NumCopies ( Command/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Command/NumCopies.o ) [455 of 622] Compiling Command.NotifyChanges ( Command/NotifyChanges.hs, dist/build/git-annex/git-annex-tmp/Command/NotifyChanges.o ) [456 of 622] Compiling Command.Multicast ( Command/Multicast.hs, dist/build/git-annex/git-annex-tmp/Command/Multicast.o ) [457 of 622] Compiling Command.MetaData ( Command/MetaData.hs, dist/build/git-annex/git-annex-tmp/Command/MetaData.o ) [458 of 622] Compiling Command.MatchExpression ( Command/MatchExpression.hs, dist/build/git-annex/git-annex-tmp/Command/MatchExpression.o ) [459 of 622] Compiling Command.Map ( Command/Map.hs, dist/build/git-annex/git-annex-tmp/Command/Map.o ) [460 of 622] Compiling Command.LookupKey ( Command/LookupKey.hs, dist/build/git-annex/git-annex-tmp/Command/LookupKey.o ) [461 of 622] Compiling Command.Log ( Command/Log.hs, dist/build/git-annex/git-annex-tmp/Command/Log.o ) [462 of 622] Compiling Command.LockContent ( Command/LockContent.hs, dist/build/git-annex/git-annex-tmp/Command/LockContent.o ) [463 of 622] Compiling Command.Lock ( Command/Lock.hs, dist/build/git-annex/git-annex-tmp/Command/Lock.o ) [464 of 622] Compiling Command.List ( Command/List.hs, dist/build/git-annex/git-annex-tmp/Command/List.o ) [465 of 622] Compiling Command.Inprogress ( Command/Inprogress.hs, dist/build/git-annex/git-annex-tmp/Command/Inprogress.o ) [466 of 622] Compiling Command.InitRemote ( Command/InitRemote.hs, dist/build/git-annex/git-annex-tmp/Command/InitRemote.o ) [467 of 622] Compiling Command.Init ( Command/Init.hs, dist/build/git-annex/git-annex-tmp/Command/Init.o ) [468 of 622] Compiling Command.Info ( Command/Info.hs, dist/build/git-annex/git-annex-tmp/Command/Info.o ) [469 of 622] Compiling Command.Indirect ( Command/Indirect.hs, dist/build/git-annex/git-annex-tmp/Command/Indirect.o ) [470 of 622] Compiling Command.InAnnex ( Command/InAnnex.hs, dist/build/git-annex/git-annex-tmp/Command/InAnnex.o ) [471 of 622] Compiling Command.GroupWanted ( Command/GroupWanted.hs, dist/build/git-annex/git-annex-tmp/Command/GroupWanted.o ) [472 of 622] Compiling Command.Group ( Command/Group.hs, dist/build/git-annex/git-annex-tmp/Command/Group.o ) [473 of 622] Compiling Command.GCryptSetup ( Command/GCryptSetup.hs, dist/build/git-annex/git-annex-tmp/Command/GCryptSetup.o ) [474 of 622] Compiling Command.FuzzTest ( Command/FuzzTest.hs, dist/build/git-annex/git-annex-tmp/Command/FuzzTest.o ) [475 of 622] Compiling Command.Fsck ( Command/Fsck.hs, dist/build/git-annex/git-annex-tmp/Command/Fsck.o ) [476 of 622] Compiling Command.Migrate ( Command/Migrate.hs, dist/build/git-annex/git-annex-tmp/Command/Migrate.o ) [477 of 622] Compiling Command.FromKey ( Command/FromKey.hs, dist/build/git-annex/git-annex-tmp/Command/FromKey.o ) [478 of 622] Compiling Command.RegisterUrl ( Command/RegisterUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RegisterUrl.o ) [479 of 622] Compiling Command.Forget ( Command/Forget.hs, dist/build/git-annex/git-annex-tmp/Command/Forget.o ) [480 of 622] Compiling Command.Fix ( Command/Fix.hs, dist/build/git-annex/git-annex-tmp/Command/Fix.o ) [481 of 622] Compiling Command.Find ( Command/Find.hs, dist/build/git-annex/git-annex-tmp/Command/Find.o ) [482 of 622] Compiling Command.FindRef ( Command/FindRef.hs, dist/build/git-annex/git-annex-tmp/Command/FindRef.o ) [483 of 622] Compiling Command.Export ( Command/Export.hs, dist/build/git-annex/git-annex-tmp/Command/Export.o ) [484 of 622] Compiling Command.Expire ( Command/Expire.hs, dist/build/git-annex/git-annex-tmp/Command/Expire.o ) [485 of 622] Compiling Command.ExamineKey ( Command/ExamineKey.hs, dist/build/git-annex/git-annex-tmp/Command/ExamineKey.o ) [486 of 622] Compiling Command.EnableTor ( Command/EnableTor.hs, dist/build/git-annex/git-annex-tmp/Command/EnableTor.o ) [487 of 622] Compiling Command.EnableRemote ( Command/EnableRemote.hs, dist/build/git-annex/git-annex-tmp/Command/EnableRemote.o ) [488 of 622] Compiling Command.DropKey ( Command/DropKey.hs, dist/build/git-annex/git-annex-tmp/Command/DropKey.o ) [489 of 622] Compiling Command.Drop ( Command/Drop.hs, dist/build/git-annex/git-annex-tmp/Command/Drop.o ) [490 of 622] Compiling Command.Move ( Command/Move.hs, dist/build/git-annex/git-annex-tmp/Command/Move.o ) [491 of 622] Compiling Command.Get ( Command/Get.hs, dist/build/git-annex/git-annex-tmp/Command/Get.o ) [492 of 622] Compiling Command.Mirror ( Command/Mirror.hs, dist/build/git-annex/git-annex-tmp/Command/Mirror.o ) [493 of 622] Compiling Command.DropUnused ( Command/DropUnused.hs, dist/build/git-annex/git-annex-tmp/Command/DropUnused.o ) [494 of 622] Compiling Command.Direct ( Command/Direct.hs, dist/build/git-annex/git-annex-tmp/Command/Direct.o ) [495 of 622] Compiling Command.DiffDriver ( Command/DiffDriver.hs, dist/build/git-annex/git-annex-tmp/Command/DiffDriver.o ) [496 of 622] Compiling Command.Describe ( Command/Describe.hs, dist/build/git-annex/git-annex-tmp/Command/Describe.o ) [497 of 622] Compiling Command.Dead ( Command/Dead.hs, dist/build/git-annex/git-annex-tmp/Command/Dead.o ) [498 of 622] Compiling Command.Copy ( Command/Copy.hs, dist/build/git-annex/git-annex-tmp/Command/Copy.o ) [499 of 622] Compiling Command.ContentLocation ( Command/ContentLocation.hs, dist/build/git-annex/git-annex-tmp/Command/ContentLocation.o ) [500 of 622] Compiling Command.Config ( Command/Config.hs, dist/build/git-annex/git-annex-tmp/Command/Config.o ) [501 of 622] Compiling Command.Commit ( Command/Commit.hs, dist/build/git-annex/git-annex-tmp/Command/Commit.o ) [502 of 622] Compiling Command.CheckPresentKey ( Command/CheckPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/CheckPresentKey.o ) [503 of 622] Compiling Command.CalcKey ( Command/CalcKey.hs, dist/build/git-annex/git-annex-tmp/Command/CalcKey.o ) [504 of 622] Compiling Command.Benchmark ( Command/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Command/Benchmark.o ) [505 of 622] Compiling Command.Adjust ( Command/Adjust.hs, dist/build/git-annex/git-annex-tmp/Command/Adjust.o ) [506 of 622] Compiling Command.AddUnused ( Command/AddUnused.hs, dist/build/git-annex/git-annex-tmp/Command/AddUnused.o ) [507 of 622] Compiling Command.Add ( Command/Add.hs, dist/build/git-annex/git-annex-tmp/Command/Add.o ) [508 of 622] Compiling Command.PreCommit ( Command/PreCommit.hs, dist/build/git-annex/git-annex-tmp/Command/PreCommit.o ) [509 of 622] Compiling Command.Unannex ( Command/Unannex.hs, dist/build/git-annex/git-annex-tmp/Command/Unannex.o ) [510 of 622] Compiling Command.Uninit ( Command/Uninit.hs, dist/build/git-annex/git-annex-tmp/Command/Uninit.o ) [511 of 622] Compiling Command.AddUrl ( Command/AddUrl.hs, dist/build/git-annex/git-annex-tmp/Command/AddUrl.o ) [512 of 622] Compiling Command.ImportFeed ( Command/ImportFeed.hs, dist/build/git-annex/git-annex-tmp/Command/ImportFeed.o ) [513 of 622] Compiling CmdLine ( CmdLine.hs, dist/build/git-annex/git-annex-tmp/CmdLine.o ) [514 of 622] Compiling Benchmark ( Benchmark.hs, dist/build/git-annex/git-annex-tmp/Benchmark.o ) [515 of 622] Compiling Annex.Import ( Annex/Import.hs, dist/build/git-annex/git-annex-tmp/Annex/Import.o ) [516 of 622] Compiling Command.Import ( Command/Import.hs, dist/build/git-annex/git-annex-tmp/Command/Import.o ) [517 of 622] Compiling Annex.Drop ( Annex/Drop.hs, dist/build/git-annex/git-annex-tmp/Annex/Drop.o ) [518 of 622] Compiling Command.Sync ( Command/Sync.hs, dist/build/git-annex/git-annex-tmp/Command/Sync.o ) [519 of 622] Compiling Command.Undo ( Command/Undo.hs, dist/build/git-annex/git-annex-tmp/Command/Undo.o ) [520 of 622] Compiling Command.PostReceive ( Command/PostReceive.hs, dist/build/git-annex/git-annex-tmp/Command/PostReceive.o ) [521 of 622] Compiling Command.Merge ( Command/Merge.hs, dist/build/git-annex/git-annex-tmp/Command/Merge.o ) [522 of 622] Compiling Command.Help ( Command/Help.hs, dist/build/git-annex/git-annex-tmp/Command/Help.o ) [523 of 622] Compiling CmdLine.GitAnnexShell.Checks ( CmdLine/GitAnnexShell/Checks.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Checks.o ) [524 of 622] Compiling Command.P2PStdIO ( Command/P2PStdIO.hs, dist/build/git-annex/git-annex-tmp/Command/P2PStdIO.o ) [525 of 622] Compiling Command.ConfigList ( Command/ConfigList.hs, dist/build/git-annex/git-annex-tmp/Command/ConfigList.o ) [526 of 622] Compiling CmdLine.GitAnnexShell ( CmdLine/GitAnnexShell.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell.o ) [527 of 622] Compiling Utility.Verifiable ( Utility/Verifiable.hs, dist/build/git-annex/git-annex-tmp/Utility/Verifiable.o ) [528 of 622] Compiling Assistant.Pairing ( Assistant/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing.o ) [529 of 622] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o ) [530 of 622] Compiling Assistant.Types.TransferrerPool ( Assistant/Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferrerPool.o ) [531 of 622] Compiling Assistant.Monad ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o ) [532 of 622] Compiling Assistant.Types.NamedThread ( Assistant/Types/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/NamedThread.o ) [533 of 622] Compiling Assistant.Common ( Assistant/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/Common.o ) [534 of 622] Compiling Assistant.WebApp.Pairing ( Assistant/WebApp/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Pairing.o ) [535 of 622] Compiling Assistant.Unused ( Assistant/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/Unused.o ) [536 of 622] Compiling Assistant.TransferrerPool ( Assistant/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferrerPool.o ) [537 of 622] Compiling Assistant.ScanRemotes ( Assistant/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/ScanRemotes.o ) [538 of 622] Compiling Assistant.RepoProblem ( Assistant/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/RepoProblem.o ) [539 of 622] Compiling Assistant.RemoteControl ( Assistant/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/RemoteControl.o ) [540 of 622] Compiling Assistant.Pushes ( Assistant/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pushes.o ) [541 of 622] Compiling Assistant.MakeRemote ( Assistant/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRemote.o ) [542 of 622] Compiling Assistant.Install ( Assistant/Install.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install.o ) [543 of 622] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/DaemonStatus.o ) [544 of 622] Compiling Assistant.TransferQueue ( Assistant/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferQueue.o ) [545 of 622] Compiling Assistant.Threads.Glacier ( Assistant/Threads/Glacier.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Glacier.o ) [546 of 622] Compiling Assistant.Threads.DaemonStatus ( Assistant/Threads/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/DaemonStatus.o ) [547 of 622] Compiling Assistant.Drop ( Assistant/Drop.hs, dist/build/git-annex/git-annex-tmp/Assistant/Drop.o ) [548 of 622] Compiling Assistant.CredPairCache ( Assistant/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/CredPairCache.o ) [549 of 622] Compiling Assistant.Commits ( Assistant/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Commits.o ) [550 of 622] Compiling Assistant.Threads.Exporter ( Assistant/Threads/Exporter.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Exporter.o ) [551 of 622] Compiling Assistant.Changes ( Assistant/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Changes.o ) [552 of 622] Compiling Assistant.BranchChange ( Assistant/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/BranchChange.o ) [553 of 622] Compiling Assistant.Threads.ConfigMonitor ( Assistant/Threads/ConfigMonitor.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ConfigMonitor.o ) [554 of 622] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o ) [555 of 622] Compiling Utility.WebApp ( Utility/WebApp.hs, dist/build/git-annex/git-annex-tmp/Utility/WebApp.o ) [556 of 622] Compiling Utility.Yesod ( Utility/Yesod.hs, dist/build/git-annex/git-annex-tmp/Utility/Yesod.o ) [557 of 622] Compiling Assistant.WebApp.Types ( Assistant/WebApp/Types.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Types.o ) [558 of 622] Compiling Assistant.WebApp.Form ( Assistant/WebApp/Form.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Form.o ) [559 of 622] Compiling Assistant.WebApp ( Assistant/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp.o ) [560 of 622] Compiling Assistant.WebApp.Notifications ( Assistant/WebApp/Notifications.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Notifications.o ) [561 of 622] Compiling Assistant.WebApp.SideBar ( Assistant/WebApp/SideBar.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/SideBar.o ) [562 of 622] Compiling Assistant.WebApp.Page ( Assistant/WebApp/Page.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Page.o ) [563 of 622] Compiling Assistant.WebApp.Common ( Assistant/WebApp/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Common.o ) [564 of 622] Compiling Assistant.WebApp.Documentation ( Assistant/WebApp/Documentation.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Documentation.o ) [565 of 622] Compiling Assistant.WebApp.Configurators.Unused ( Assistant/WebApp/Configurators/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Unused.o ) [566 of 622] Compiling Assistant.WebApp.Configurators.Preferences ( Assistant/WebApp/Configurators/Preferences.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Preferences.o ) [567 of 622] Compiling Annex.MakeRepo ( Annex/MakeRepo.hs, dist/build/git-annex/git-annex-tmp/Annex/MakeRepo.o ) [568 of 622] Compiling Assistant.Types.UrlRenderer ( Assistant/Types/UrlRenderer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/UrlRenderer.o ) [569 of 622] Compiling Assistant.Alert ( Assistant/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert.o ) [570 of 622] Compiling Assistant.TransferSlots ( Assistant/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferSlots.o ) [571 of 622] Compiling Assistant.Threads.Transferrer ( Assistant/Threads/Transferrer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Transferrer.o ) [572 of 622] Compiling Assistant.Threads.TransferWatcher ( Assistant/Threads/TransferWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferWatcher.o ) [573 of 622] Compiling Assistant.Threads.TransferPoller ( Assistant/Threads/TransferPoller.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferPoller.o ) [574 of 622] Compiling Assistant.Threads.Watcher ( Assistant/Threads/Watcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Watcher.o ) [575 of 622] Compiling Assistant.Threads.RemoteControl ( Assistant/Threads/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/RemoteControl.o ) [576 of 622] Compiling Assistant.Threads.Committer ( Assistant/Threads/Committer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Committer.o ) [577 of 622] Compiling Assistant.NamedThread ( Assistant/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/NamedThread.o ) [578 of 622] Compiling Assistant.Sync ( Assistant/Sync.hs, dist/build/git-annex/git-annex-tmp/Assistant/Sync.o ) [579 of 622] Compiling Assistant.WebApp.RepoList ( Assistant/WebApp/RepoList.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoList.o ) [580 of 622] Compiling Assistant.WebApp.DashBoard ( Assistant/WebApp/DashBoard.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/DashBoard.o ) [581 of 622] Compiling Assistant.WebApp.Configurators ( Assistant/WebApp/Configurators.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators.o ) [582 of 622] Compiling Assistant.WebApp.MakeRemote ( Assistant/WebApp/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/MakeRemote.o ) [583 of 622] Compiling Assistant.WebApp.Gpg ( Assistant/WebApp/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Gpg.o ) [584 of 622] Compiling Assistant.WebApp.Configurators.WebDAV ( Assistant/WebApp/Configurators/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/WebDAV.o ) [585 of 622] Compiling Assistant.WebApp.Configurators.Ssh ( Assistant/WebApp/Configurators/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Ssh.o ) [586 of 622] Compiling Assistant.WebApp.Configurators.AWS ( Assistant/WebApp/Configurators/AWS.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/AWS.o ) [587 of 622] Compiling Assistant.WebApp.Configurators.IA ( Assistant/WebApp/Configurators/IA.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/IA.o ) [588 of 622] Compiling Assistant.WebApp.Configurators.Edit ( Assistant/WebApp/Configurators/Edit.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Edit.o ) [589 of 622] Compiling Assistant.Threads.Pusher ( Assistant/Threads/Pusher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Pusher.o ) [590 of 622] Compiling Assistant.Threads.NetWatcher ( Assistant/Threads/NetWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/NetWatcher.o ) [591 of 622] Compiling Assistant.Threads.Merger ( Assistant/Threads/Merger.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Merger.o ) [592 of 622] Compiling Assistant.Repair ( Assistant/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/Repair.o ) [593 of 622] Compiling Assistant.WebApp.Repair ( Assistant/WebApp/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Repair.o ) [594 of 622] Compiling Assistant.Threads.ProblemFixer ( Assistant/Threads/ProblemFixer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ProblemFixer.o ) [595 of 622] Compiling Assistant.Pairing.MakeRemote ( Assistant/Pairing/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/MakeRemote.o ) [596 of 622] Compiling Assistant.WebApp.Configurators.Pairing ( Assistant/WebApp/Configurators/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Pairing.o ) [597 of 622] Compiling Assistant.Threads.PairListener ( Assistant/Threads/PairListener.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/PairListener.o ) [598 of 622] Compiling Assistant.Restart ( Assistant/Restart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Restart.o ) [599 of 622] Compiling Assistant.WebApp.OtherRepos ( Assistant/WebApp/OtherRepos.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/OtherRepos.o ) [600 of 622] Compiling Assistant.WebApp.Control ( Assistant/WebApp/Control.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Control.o ) [601 of 622] Compiling Assistant.WebApp.Configurators.Local ( Assistant/WebApp/Configurators/Local.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Local.o ) [602 of 622] Compiling Assistant.Upgrade ( Assistant/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/Upgrade.o ) [603 of 622] Compiling Assistant.WebApp.Configurators.Upgrade ( Assistant/WebApp/Configurators/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Upgrade.o ) [604 of 622] Compiling Assistant.Threads.Upgrader ( Assistant/Threads/Upgrader.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Upgrader.o ) [605 of 622] Compiling Assistant.Threads.UpgradeWatcher ( Assistant/Threads/UpgradeWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/UpgradeWatcher.o ) [606 of 622] Compiling Assistant.Threads.SanityChecker ( Assistant/Threads/SanityChecker.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/SanityChecker.o ) [607 of 622] Compiling Assistant.Fsck ( Assistant/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/Fsck.o ) [608 of 622] Compiling Assistant.WebApp.Configurators.Fsck ( Assistant/WebApp/Configurators/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Fsck.o ) [609 of 622] Compiling Assistant.Threads.MountWatcher ( Assistant/Threads/MountWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/MountWatcher.o ) [610 of 622] Compiling Assistant.Threads.Cronner ( Assistant/Threads/Cronner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Cronner.o ) [611 of 622] Compiling Assistant.DeleteRemote ( Assistant/DeleteRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/DeleteRemote.o ) [612 of 622] Compiling Assistant.WebApp.Configurators.Delete ( Assistant/WebApp/Configurators/Delete.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Delete.o ) [613 of 622] Compiling Assistant.Threads.WebApp ( Assistant/Threads/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/WebApp.o ) [614 of 622] Compiling Assistant.Threads.TransferScanner ( Assistant/Threads/TransferScanner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferScanner.o ) [615 of 622] Compiling Assistant ( Assistant.hs, dist/build/git-annex/git-annex-tmp/Assistant.o ) [616 of 622] Compiling Command.WebApp ( Command/WebApp.hs, dist/build/git-annex/git-annex-tmp/Command/WebApp.o ) [617 of 622] Compiling Command.Watch ( Command/Watch.hs, dist/build/git-annex/git-annex-tmp/Command/Watch.o ) [618 of 622] Compiling Command.Assistant ( Command/Assistant.hs, dist/build/git-annex/git-annex-tmp/Command/Assistant.o ) [619 of 622] Compiling CmdLine.GitAnnex ( CmdLine/GitAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex.o ) [620 of 622] Compiling Test.Framework ( Test/Framework.hs, dist/build/git-annex/git-annex-tmp/Test/Framework.o ) [621 of 622] Compiling Test ( Test.hs, dist/build/git-annex/git-annex-tmp/Test.o ) [622 of 622] 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-whereis.mdwn scanning git-annex-get.mdwn scanning git-annex-fsck.mdwn scanning git-annex-sync.mdwn scanning git-annex-trust.mdwn scanning git-annex-addunused.mdwn scanning git-annex-unused.mdwn scanning logo_16x16.png scanning git-annex-examinekey.mdwn scanning git-annex-initremote.mdwn scanning git-annex-readpresentkey.mdwn scanning git-annex-enable-tor.mdwn scanning git-annex-status.mdwn scanning git-annex-vpop.mdwn scanning git-annex-matchexpression.mdwn scanning git-annex-export.mdwn scanning git-annex-addurl.mdwn scanning git-annex-info.mdwn scanning git-annex-fuzztest.mdwn scanning git-annex-semitrust.mdwn scanning git-annex-group.mdwn scanning git-annex-log.mdwn scanning git-annex-fix.mdwn scanning git-annex-mirror.mdwn scanning git-annex-transferkey.mdwn scanning git-annex-rekey.mdwn scanning git-annex-required.mdwn scanning git-annex-reinit.mdwn scanning git-annex-edit.mdwn scanning git-annex-smudge.mdwn scanning git-annex-multicast.mdwn scanning git-annex-inprogress.mdwn scanning git-annex-pre-commit.mdwn scanning git-annex-copy.mdwn scanning git-annex-renameremote.mdwn scanning git-annex-shell.mdwn scanning git-annex-dropkey.mdwn scanning git-annex-expire.mdwn scanning git-annex-migrate.mdwn scanning git-annex-findref.mdwn scanning git-annex-assistant.mdwn scanning git-annex-test.mdwn scanning git-annex-map.mdwn scanning git-annex-version.mdwn scanning git-annex-describe.mdwn scanning git-annex-unlock.mdwn scanning git-annex-importfeed.mdwn scanning git-annex-vcycle.mdwn scanning git-annex-matching-options.mdwn scanning git-annex-adjust.mdwn scanning git-annex-vadd.mdwn scanning git-annex-setkey.mdwn scanning git-annex-webapp.mdwn scanning git-annex-contentlocation.mdwn scanning git-annex-rmurl.mdwn scanning git-annex-watch.mdwn scanning git-annex-upgrade.mdwn scanning git-annex-repair.mdwn scanning git-annex-merge.mdwn scanning git-annex-proxy.mdwn scanning git-annex-diffdriver.mdwn scanning git-annex-dead.mdwn scanning git-annex-drop.mdwn scanning git-annex-lookupkey.mdwn scanning git-annex-preferred-content.mdwn scanning git-annex-find.mdwn scanning git-annex-registerurl.mdwn scanning index.mdwn scanning git-annex-remotedaemon.mdwn scanning git-annex-lock.mdwn scanning logo.svg scanning git-annex-list.mdwn scanning git-annex-enableremote.mdwn scanning git-annex-init.mdwn scanning git-annex-forget.mdwn scanning git-annex-testremote.mdwn scanning git-annex-calckey.mdwn scanning git-annex-numcopies.mdwn scanning git-annex-fromkey.mdwn scanning git-annex-reinject.mdwn scanning git-annex-resolvemerge.mdwn scanning git-annex-move.mdwn scanning git-annex-untrust.mdwn scanning git-annex-dropunused.mdwn scanning git-annex-groupwanted.mdwn scanning git-annex-schedule.mdwn scanning git-annex-transferkeys.mdwn scanning git-remote-tor-annex.mdwn scanning git-annex-vicfg.mdwn scanning git-annex-ungroup.mdwn scanning git-annex-setpresentkey.mdwn scanning git-annex-unannex.mdwn scanning git-annex.mdwn scanning git-annex-uninit.mdwn scanning git-annex-indirect.mdwn scanning git-annex-metadata.mdwn scanning git-annex-vfilter.mdwn scanning git-annex-checkpresentkey.mdwn scanning git-annex-direct.mdwn scanning git-annex-add.mdwn scanning git-annex-import.mdwn scanning git-annex-view.mdwn scanning git-annex-p2p.mdwn scanning git-annex-wanted.mdwn scanning git-annex-undo.mdwn scanning license/AGPL scanning license/GPL scanning ikiwiki/toggle.js scanning ikiwiki/ikiwiki.js scanning ikiwiki/relativedate.js building git-annex-whereis.mdwn building git-annex-get.mdwn building git-annex-fsck.mdwn building git-annex-sync.mdwn building git-annex-trust.mdwn building git-annex-addunused.mdwn building git-annex-unused.mdwn building logo_16x16.png building git-annex-examinekey.mdwn building git-annex-initremote.mdwn building git-annex-readpresentkey.mdwn building git-annex-enable-tor.mdwn building git-annex-status.mdwn building git-annex-vpop.mdwn building git-annex-matchexpression.mdwn building git-annex-export.mdwn building git-annex-addurl.mdwn building git-annex-info.mdwn building git-annex-fuzztest.mdwn building git-annex-semitrust.mdwn building git-annex-group.mdwn building git-annex-log.mdwn building git-annex-fix.mdwn building git-annex-mirror.mdwn building git-annex-transferkey.mdwn building git-annex-rekey.mdwn building git-annex-required.mdwn building git-annex-reinit.mdwn building git-annex-edit.mdwn building git-annex-smudge.mdwn building git-annex-multicast.mdwn building git-annex-inprogress.mdwn building git-annex-pre-commit.mdwn building git-annex-copy.mdwn building git-annex-renameremote.mdwn building git-annex-shell.mdwn building git-annex-dropkey.mdwn building git-annex-expire.mdwn building git-annex-migrate.mdwn building git-annex-findref.mdwn building git-annex-assistant.mdwn building git-annex-test.mdwn building git-annex-map.mdwn building git-annex-version.mdwn building git-annex-describe.mdwn building git-annex-unlock.mdwn building git-annex-importfeed.mdwn building git-annex-vcycle.mdwn building git-annex-matching-options.mdwn building git-annex-adjust.mdwn building git-annex-vadd.mdwn building git-annex-setkey.mdwn building git-annex-webapp.mdwn building git-annex-contentlocation.mdwn building git-annex-rmurl.mdwn building git-annex-watch.mdwn building git-annex-upgrade.mdwn building git-annex-repair.mdwn building git-annex-merge.mdwn building git-annex-proxy.mdwn building git-annex-diffdriver.mdwn building git-annex-dead.mdwn building git-annex-drop.mdwn building git-annex-lookupkey.mdwn building git-annex-preferred-content.mdwn building git-annex-find.mdwn building git-annex-registerurl.mdwn building index.mdwn building git-annex-remotedaemon.mdwn building git-annex-lock.mdwn building logo.svg building git-annex-list.mdwn building git-annex-enableremote.mdwn building git-annex-init.mdwn building git-annex-forget.mdwn building git-annex-testremote.mdwn building git-annex-calckey.mdwn building git-annex-numcopies.mdwn building git-annex-fromkey.mdwn building git-annex-reinject.mdwn building git-annex-resolvemerge.mdwn building git-annex-move.mdwn building git-annex-untrust.mdwn building git-annex-dropunused.mdwn building git-annex-groupwanted.mdwn building git-annex-schedule.mdwn building git-annex-transferkeys.mdwn building git-remote-tor-annex.mdwn building git-annex-vicfg.mdwn building git-annex-ungroup.mdwn building git-annex-setpresentkey.mdwn building git-annex-unannex.mdwn building git-annex.mdwn building git-annex-uninit.mdwn building git-annex-indirect.mdwn building git-annex-metadata.mdwn building git-annex-vfilter.mdwn building git-annex-checkpresentkey.mdwn building git-annex-direct.mdwn building git-annex-add.mdwn building git-annex-import.mdwn building git-annex-view.mdwn building git-annex-p2p.mdwn building git-annex-wanted.mdwn building git-annex-undo.mdwn building license/AGPL building license/GPL building ikiwiki/toggle.js building ikiwiki/ikiwiki.js building ikiwiki/relativedate.js done Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.jLDUFC + exit 0 + umask 022 + cd /builddir/build/BUILD + '[' /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 '!=' / ']' + rm -rf /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 BUILDSTDERR: ++ dirname /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 + mkdir -p /builddir/build/BUILDROOT + mkdir /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 + cd git-annex-7.20190626 + '[' -x Setup ']' + LANG=C.utf8 + ./Setup copy --destdir=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 -v directory dist/doc/html/git-annex does exist: False creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex Installing COPYRIGHT to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex/COPYRIGHT Installing executable git-annex in /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin BUILDSTDERR: Warning: Executable installed in BUILDSTDERR: /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin Installing executable dist/build/git-annex/git-annex to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin/git-annex /usr/bin/strip /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin/git-annex ln -sf git-annex /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin/git-annex-shell ln -sf git-annex /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin/git-remote-tor-annex creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1 creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man creating /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1 Installing man/git-annex-whereis.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-whereis.1 Installing man/git-annex-get.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-get.1 Installing man/git-annex-fsck.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-fsck.1 Installing man/git-annex-sync.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-sync.1 Installing man/git-annex-trust.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-trust.1 Installing man/git-annex-addunused.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-addunused.1 Installing man/git-annex-unused.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-unused.1 Installing man/git-annex-examinekey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-examinekey.1 Installing man/git-annex-initremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-initremote.1 Installing man/git-annex-readpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-readpresentkey.1 Installing man/git-annex-enable-tor.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-enable-tor.1 Installing man/git-annex-status.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-status.1 Installing man/git-annex-vpop.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-vpop.1 Installing man/git-annex-matchexpression.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-matchexpression.1 Installing man/git-annex-export.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-export.1 Installing man/git-annex-addurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-addurl.1 Installing man/git-annex-info.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-info.1 Installing man/git-annex-fuzztest.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-fuzztest.1 Installing man/git-annex-semitrust.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-semitrust.1 Installing man/git-annex-group.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-group.1 Installing man/git-annex-log.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-log.1 Installing man/git-annex-fix.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-fix.1 Installing man/git-annex-mirror.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-mirror.1 Installing man/git-annex-transferkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-transferkey.1 Installing man/git-annex-rekey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-rekey.1 Installing man/git-annex-required.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-required.1 Installing man/git-annex-reinit.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-reinit.1 Installing man/git-annex-edit.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-edit.1 Installing man/git-annex-smudge.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-smudge.1 Installing man/git-annex-multicast.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-multicast.1 Installing man/git-annex-inprogress.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-inprogress.1 Installing man/git-annex-pre-commit.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-pre-commit.1 Installing man/git-annex-copy.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-copy.1 Installing man/git-annex-renameremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-renameremote.1 Installing man/git-annex-shell.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-shell.1 Installing man/git-annex-dropkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-dropkey.1 Installing man/git-annex-expire.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-expire.1 Installing man/git-annex-migrate.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-migrate.1 Installing man/git-annex-findref.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-findref.1 Installing man/git-annex-assistant.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-assistant.1 Installing man/git-annex-test.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-test.1 Installing man/git-annex-map.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-map.1 Installing man/git-annex-version.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-version.1 Installing man/git-annex-describe.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-describe.1 Installing man/git-annex-unlock.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-unlock.1 Installing man/git-annex-importfeed.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-importfeed.1 Installing man/git-annex-vcycle.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-vcycle.1 Installing man/git-annex-matching-options.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-matching-options.1 Installing man/git-annex-adjust.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-adjust.1 Installing man/git-annex-vadd.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-vadd.1 Installing man/git-annex-setkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-setkey.1 Installing man/git-annex-webapp.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-webapp.1 Installing man/git-annex-contentlocation.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-contentlocation.1 Installing man/git-annex-rmurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-rmurl.1 Installing man/git-annex-watch.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-watch.1 Installing man/git-annex-upgrade.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-upgrade.1 Installing man/git-annex-repair.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-repair.1 Installing man/git-annex-merge.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-merge.1 Installing man/git-annex-proxy.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-proxy.1 Installing man/git-annex-diffdriver.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-diffdriver.1 Installing man/git-annex-dead.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-dead.1 Installing man/git-annex-drop.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-drop.1 Installing man/git-annex-lookupkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-lookupkey.1 Installing man/git-annex-preferred-content.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-preferred-content.1 Installing man/git-annex-find.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-find.1 Installing man/git-annex-registerurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-registerurl.1 Installing man/git-annex-remotedaemon.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-remotedaemon.1 Installing man/git-annex-lock.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-lock.1 Installing man/git-annex-list.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-list.1 Installing man/git-annex-enableremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-enableremote.1 Installing man/git-annex-init.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-init.1 Installing man/git-annex-forget.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-forget.1 Installing man/git-annex-testremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-testremote.1 Installing man/git-annex-calckey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-calckey.1 Installing man/git-annex-numcopies.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-numcopies.1 Installing man/git-annex-fromkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-fromkey.1 Installing man/git-annex-reinject.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-reinject.1 Installing man/git-annex-resolvemerge.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-resolvemerge.1 Installing man/git-annex-move.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-move.1 Installing man/git-annex-untrust.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-untrust.1 Installing man/git-annex-dropunused.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-dropunused.1 Installing man/git-annex-groupwanted.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-groupwanted.1 Installing man/git-annex-schedule.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-schedule.1 Installing man/git-annex-transferkeys.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-transferkeys.1 Installing man/git-remote-tor-annex.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-remote-tor-annex.1 Installing man/git-annex-vicfg.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-vicfg.1 Installing man/git-annex-ungroup.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-ungroup.1 Installing man/git-annex-setpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-setpresentkey.1 Installing man/git-annex-unannex.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-unannex.1 Installing man/git-annex.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex.1 Installing man/git-annex-uninit.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-uninit.1 Installing man/git-annex-indirect.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-indirect.1 Installing man/git-annex-metadata.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-metadata.1 Installing man/git-annex-vfilter.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-vfilter.1 Installing man/git-annex-checkpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-checkpresentkey.1 Installing man/git-annex-direct.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-direct.1 Installing man/git-annex-add.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-add.1 Installing man/git-annex-import.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-import.1 Installing man/git-annex-view.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-view.1 Installing man/git-annex-p2p.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-p2p.1 Installing man/git-annex-wanted.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-wanted.1 Installing man/git-annex-undo.1 to /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/man/man1/git-annex-undo.1 BUILDSTDERR: ++ pkg-config --variable=completionsdir bash-completion + bash_completion_dir=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/bash-completion/completions + mkdir -p /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/bash-completion/completions + install -m 644 bash-completion.bash /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.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/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.49lTy4 + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + mkdir test + pushd test ~/build/BUILD/git-annex-7.20190626/test ~/build/BUILD/git-annex-7.20190626 + PATH=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin + git annex test Tests QuickCheck prop_encode_decode_roundtrip: OK (0.23s) +++ OK, passed 1000 tests. prop_encode_c_decode_c_roundtrip: OK (0.21s) +++ OK, passed 1000 tests. prop_isomorphic_key_encode: OK (0.19s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape: OK (0.12s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape_multiword: OK (4.53s) +++ OK, passed 1000 tests. prop_isomorphic_configEscape: OK (0.10s) +++ OK, passed 1000 tests. prop_parse_show_Config: OK (0.20s) +++ OK, passed 1000 tests. prop_upFrom_basics: OK (0.09s) +++ OK, passed 1000 tests. prop_relPathDirToFile_basics: OK (0.16s) +++ OK, passed 1000 tests. prop_relPathDirToFile_regressionTest: OK +++ OK, passed 1 tests. prop_cost_sane: OK +++ OK, passed 1 tests. prop_matcher_sane: OK +++ OK, passed 1 tests. prop_HmacSha1WithCipher_sane: OK +++ OK, passed 1 tests. prop_VectorClock_sane: OK +++ OK, passed 1 tests. prop_addMapLog_sane: OK +++ OK, passed 1 tests. prop_verifiable_sane: OK (0.38s) +++ OK, passed 1000 tests. prop_segment_regressionTest: OK +++ OK, passed 1 tests. prop_read_write_transferinfo: OK (0.17s) +++ OK, passed 1000 tests. prop_read_show_inodecache: OK (0.08s) +++ OK, passed 1000 tests. prop_parse_build_presence_log: OK (7.20s) +++ OK, passed 1000 tests. prop_parse_build_contentidentifier_log: OK (6.61s) +++ OK, passed 1000 tests. prop_read_show_TrustLevel: OK +++ OK, passed 1 tests. prop_parse_build_TrustLevelLog: OK +++ OK, passed 1 tests. prop_hashes_stable: OK +++ OK, passed 1 tests. prop_mac_stable: OK +++ OK, passed 1 tests. prop_schedule_roundtrips: OK (0.05s) +++ OK, passed 1000 tests. prop_past_sane: OK +++ OK, passed 1 tests. prop_duration_roundtrips: OK (0.02s) +++ OK, passed 1000 tests. prop_metadata_sane: OK (4.34s) +++ OK, passed 1000 tests. prop_metadata_serialize: OK (4.62s) +++ OK, passed 1000 tests. prop_branchView_legal: OK (3.31s) +++ OK, passed 1000 tests. prop_viewPath_roundtrips: OK (0.20s) +++ OK, passed 1000 tests. prop_view_roundtrips: OK (2.68s) +++ 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 tests. Unit Tests v7 unlocked add dup: Init Tests init: init test repo ok (recording state in git...) OK (0.12s) add: add sha1foo 100% 25 B 41 KiB/s 0s ok (recording state in git...) unlock sha1foo ok (recording state in git...) OK (0.89s) All 2 tests passed (1.02s) BUILDSTDERR: 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.81s) add extras: add apple ok (recording state in git...) unlock apple ok (recording state in git...) OK (0.81s) export_import: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) 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 43 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) Updating 9bcabc3..b016a54 Fast-forward (no commit created; -m option ignored) 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 add import 100% 23 B 8 KiB/s 0s ok (recording state in git...) unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 8 KiB/s 0s ok (recording state in git...) list foo ok import foo import 100% 23 B 70 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...) unexport foo import ok export foo import ok (recording state in git...) OK (4.17s) export_import_subdir: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) [master d3af9b6] moved 1 file changed, 0 insertions(+), 0 deletions(-) rename foo => subdir/foo (100%) list foo ok update refs/remotes/foo/master ok (recording state in git...) Merge made by the 'recursive' strategy. export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok (recording state in git...) Updating 2e6780c..baccadb Fast-forward (no commit created; -m option ignored) subdir/foo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 120000 subdir/foo (recording state in git...) list foo ok update refs/remotes/foo/master ok Updating baccadb..5aa3687 Fast-forward (no commit created; -m option ignored) (recording state in git...) OK (2.92s) shared clone: OK (0.57s) log: + Thu, 27 Jun 2019 06:13:29 UTC foo | dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] OK (0.57s) 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...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.97s) reinject: reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (1.09s) unannex (no copy): OK (0.54s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (1.03s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (1.18s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (1.29s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (1.02s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (1.01s) get (ssh remote): get foo (from origin...) 100% 20 B 686 B/s 0s (checksum...) ok (recording state in git...) OK (1.04s) move: move foo (from origin...) (checksum...) (recording state in git...) ok (recording state in git...) move foo (to origin...) (checksum...) (recording state in git...) ok (recording state in git...) OK (1.81s) move (ssh remote): move foo (from origin...) 100% 20 B 632 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.59s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (1.54s) 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...) (checksum...) ok (recording state in git...) BUILDSTDERR: 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) 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...) BUILDSTDERR: drop: 1 failed OK (2.27s) lock (v7 --force): upgrade ok get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: 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) lock foo (checksum...) ok (recording state in git...) OK (1.35s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (1.38s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) (recording state in git...) OK (1.42s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (1.38s) fix: OK (0.70s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) OK (1.07s) 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.03s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (1.52s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.47s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] BUILDSTDERR: e909752f-b802-4893-995b-59e3c0c27f06 -- .t/tmprepo28 [here] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (1.03s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] OK (1.33s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.67s) migrate: get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.17s) migrate (via gitattributes): get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.21s) unused: unused . (checking for unused data...) ok get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok 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 unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 2 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) 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 4 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 (2.96s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.66s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) dir/subfile OK (1.46s) merge: merge git-annex ok OK (0.87s) info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"14cd5230-1396-4d60-bb05-9da2fb3a8300","description":".t/tmprepo37"},{"here":false,"uuid":"dc7db7b6-d931-4efc-ad66-01dde1cd3cf3","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"337.73 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} OK (0.63s) version: git-annex version: 7.20190626 build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 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 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 hook external operating system: linux aarch64 supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (0.58s) 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 7b3e7ca..65e124f git-annex -> synced/git-annex ok foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 65e124f..0112a9f git-annex -> synced/git-annex ok OK (2.17s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo41 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo41 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo42 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo42 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo41 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [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 BUILDSTDERR: From ../../.t/tmprepo42 BUILDSTDERR: a948a25..cc482dd git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo41 BUILDSTDERR: a948a25..86ca29d git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo42 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo41 BUILDSTDERR: a948a25..01fb32b git-annex -> synced/git-annex ok OK (4.53s) adjusted branch merge regression: upgrade ok adjust BUILDSTDERR: 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) 5262cdd] git-annex in .t/tmprepo43 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo44 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo44 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) c754f8a] git-annex in .t/tmprepo44 1 file changed, 1 insertion(+) create mode 100644 conflictor ok merge synced/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating c754f8a..5b25912 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo43 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo43 BUILDSTDERR: e0c1f1a..d7d65c6 master -> synced/master BUILDSTDERR: * [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 e0c1f1a..d7d65c6 Fast-forward (Merging into adjusted branch...) Updating f4ad9bd..7aa82a5 Fast-forward ok pull r2 BUILDSTDERR: From ../../.t/tmprepo44 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: 4a3c37b..c86c043 git-annex -> r2/git-annex BUILDSTDERR: 9bcabc3..d7d65c6 master -> r2/master BUILDSTDERR: e0c1f1a..d7d65c6 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo43 BUILDSTDERR: + f4ad9bd...62f418b adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (3.08s) adjusted branch subtree regression: upgrade ok adjust BUILDSTDERR: 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) ce5f810] git-annex in .t/tmprepo45 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y 100% 3 B 1 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 6862c98] git-annex in .t/tmprepo45 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok BUILDSTDERR: Switched to branch 'master' OK (1.54s) conflict resolution: commit (recording state in git...) [master e1c5b8a] git-annex in .t/tmprepo46 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master bf81ef4] git-annex in .t/tmprepo47 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo47 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 67d32d3] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo47 BUILDSTDERR: bf81ef4..67d32d3 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating bf81ef4..67d32d3 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 BUILDSTDERR: From ../../.t/tmprepo46 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo47 BUILDSTDERR: bf81ef4..67d32d3 master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (3.88s) conflict resolution (adjusted branch): commit (recording state in git...) [master 1d85559] git-annex in .t/tmprepo48 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master f71a439] git-annex in .t/tmprepo49 1 file changed, 1 insertion(+) create mode 100644 conflictor ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo49 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 630e6fe] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo49 BUILDSTDERR: f71a439..630e6fe master -> synced/master BUILDSTDERR: * [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 f71a439..630e6fe 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 348caa8..0c4717c 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 BUILDSTDERR: From ../../.t/tmprepo48 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo49 BUILDSTDERR: + 348caa8...6adb4d8 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (4.07s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master d3c9102] git-annex in .t/tmprepo50 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo51 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo51 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit BUILDSTDERR: (recording state in git...) [master c96df9d] git-annex in .t/tmprepo51 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. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master b18fc38] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo50 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo50 BUILDSTDERR: d3c9102..b18fc38 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating d3c9102..b18fc38 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 BUILDSTDERR: From ../../.t/tmprepo51 BUILDSTDERR: c989398..cf1fe71 git-annex -> r2/git-annex BUILDSTDERR: 9bcabc3..b18fc38 master -> r2/master BUILDSTDERR: d3c9102..b18fc38 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (4.41s) conflict resolution (mixed directory and file): commit (recording state in git...) [master 8c3ebb9] git-annex in .t/tmprepo52 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 3ae524e] git-annex in .t/tmprepo53 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo53 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 1f0ef4b] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo53 BUILDSTDERR: 3ae524e..1f0ef4b master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 3ae524e..1f0ef4b Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo52 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 commit (recording state in git...) [master f6fbbf3] git-annex in .t/tmprepo54 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 7cd4923] git-annex in .t/tmprepo55 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo54 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 3d3f308] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo54 BUILDSTDERR: f6fbbf3..3d3f308 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f6fbbf3..3d3f308 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 BUILDSTDERR: From ../../.t/tmprepo55 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (7.82s) conflict resolution symlink bit: OK conflict resolution (uncommitted local file): commit (recording state in git...) [master 7bc959f] git-annex in .t/tmprepo56 1 file changed, 1 insertion(+) create mode 100644 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo56 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 9bcabc3..7bc959f BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 9bcabc3..7bc959f BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo56 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo56' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo56 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo56' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. commit (recording state in git...) [master 03ac55b] git-annex in .t/tmprepo58 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 BUILDSTDERR: From ../../.t/tmprepo58 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 9bcabc3..03ac55b BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 9bcabc3..03ac55b BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo58 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo58' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo58 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo58' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. OK (4.01s) BUILDSTDERR: conflict resolution (removed file): Pushing to r1 failed. commit (recording state in git...) [master 607dcc6] git-annex in .t/tmprepo60 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo60 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 9bcabc3..607dcc6 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 BUILDSTDERR: To ../../.t/tmprepo60 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit [master a1f8721] git-annex in .t/tmprepo60 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo61 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo61 BUILDSTDERR: 607dcc6..a1f8721 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit BUILDSTDERR: (recording state in git...) [master 9efab9a] git-annex in .t/tmprepo61 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master e2021ac] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo60 BUILDSTDERR: 96ee407..938687f git-annex -> r1/git-annex BUILDSTDERR: 607dcc6..a1f8721 master -> r1/master BUILDSTDERR: 607dcc6..a1f8721 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo60 BUILDSTDERR: 96ee407..2fdbc7a git-annex -> synced/git-annex BUILDSTDERR: a1f8721..e2021ac master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating a1f8721..e2021ac Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo61 BUILDSTDERR: 938687f..2fdbc7a git-annex -> r2/git-annex BUILDSTDERR: 607dcc6..e2021ac master -> r2/master BUILDSTDERR: a1f8721..e2021ac synced/master -> r2/synced/master ok commit (recording state in git...) [master 1e4551e] git-annex in .t/tmprepo62 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo62 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 9bcabc3..1e4551e 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 BUILDSTDERR: To ../../.t/tmprepo62 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master 59252ef] git-annex in .t/tmprepo63 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo62 BUILDSTDERR: 135518a..346ea8c git-annex -> synced/git-annex BUILDSTDERR: 1e4551e..59252ef master -> synced/master ok commit [master 2e580c8] git-annex in .t/tmprepo62 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 386c93c] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo63 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo63 BUILDSTDERR: 59252ef..386c93c master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 59252ef..386c93c Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo62 BUILDSTDERR: 1e4551e..386c93c master -> r1/master BUILDSTDERR: 59252ef..386c93c synced/master -> r1/synced/master ok OK (7.42s) conflict resolution (nonannexed file): commit (recording state in git...) [master 076a646] git-annex in .t/tmprepo64 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master ea3262f] git-annex in .t/tmprepo65 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo65 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master cb57798] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo65 BUILDSTDERR: ea3262f..cb57798 master -> synced/master BUILDSTDERR: * [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 ea3262f..cb57798 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo64 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) commit (recording state in git...) [master ac97826] git-annex in .t/tmprepo66 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 6eecf3c] git-annex in .t/tmprepo67 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo66 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master cc0fa88] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo66 BUILDSTDERR: ac97826..cc0fa88 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating ac97826..cc0fa88 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo67 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (recording state in git...) commit (recording state in git...) [master f0d1313] git-annex in .t/tmprepo68 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 403556b] git-annex in .t/tmprepo69 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo69 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 7c89fca] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo69 BUILDSTDERR: 403556b..7c89fca master -> synced/master BUILDSTDERR: * [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 403556b..7c89fca Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo68 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) commit (recording state in git...) [master e12fd0b] git-annex in .t/tmprepo70 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 455b881] git-annex in .t/tmprepo71 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo70 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master c230b66] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo70 BUILDSTDERR: e12fd0b..c230b66 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e12fd0b..c230b66 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo71 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (recording state in git...) OK (11.92s) conflict resolution (nonannexed symlink): commit (recording state in git...) [master 7dfcaa9] git-annex in .t/tmprepo72 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master db87bb3] git-annex in .t/tmprepo73 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo73 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a3e5876] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo73 BUILDSTDERR: db87bb3..a3e5876 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating db87bb3..a3e5876 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo72 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit (recording state in git...) [master f219f0c] git-annex in .t/tmprepo74 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master fc62fc2] git-annex in .t/tmprepo75 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo74 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 046c7d5] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo74 BUILDSTDERR: f219f0c..046c7d5 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f219f0c..046c7d5 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 BUILDSTDERR: From ../../.t/tmprepo75 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok commit (recording state in git...) [master c6c00fc] git-annex in .t/tmprepo76 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master d9f8883] git-annex in .t/tmprepo77 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo77 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 01006b6] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo77 BUILDSTDERR: d9f8883..01006b6 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating d9f8883..01006b6 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo76 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit (recording state in git...) [master a9926dc] git-annex in .t/tmprepo78 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master ce4d539] git-annex in .t/tmprepo79 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo78 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 7b695cb] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo78 BUILDSTDERR: a9926dc..7b695cb master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating a9926dc..7b695cb 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 BUILDSTDERR: From ../../.t/tmprepo79 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (11.52s) conflict resolution (mixed locked and unlocked file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master e1ff7cd] git-annex in .t/tmprepo80 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 0bc5520] git-annex in .t/tmprepo81 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo81 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. BUILDSTDERR: 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 50d3227] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo81 BUILDSTDERR: 0bc5520..50d3227 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 0bc5520..50d3227 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo80 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo81 BUILDSTDERR: 0bc5520..50d3227 master -> r2/master ok conflictor conflictor OK (2.96s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot OK (0.71s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was d548ee5). BUILDSTDERR: ExitSuccess OK (1.24s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (0.87s) upgrade: upgrade ok OK (0.59s) whereis: whereis foo (1 copy) dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 393560f4-8ba1-435d-9cdb-308fcfeef011 -- .t/tmprepo86 [here] The following untrusted locations may also have copies: dc7db7b6-d931-4efc-ad66-01dde1cd3cf3 -- test repo [origin] ok OK (0.95s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (1.52s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 25 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 50 KiB/s 0s (checksum...) ok (recording state in git...) OK (1.71s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.90s) bup remote: OK (0.56s) crypto: OK (1.69s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (2.82s) add subdirs: add dir/foo 100% 24 B 9 KiB/s 0s ok (recording state in git...) add ../dir2/foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (1.05s) BUILDSTDERR: addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo96/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo96/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo96/myurl (to _builddir_build_BUILD_git_annex_7.20190626_test_.t_tmprepo96_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo96/myurl (to addurlurldest) ok (recording state in git...) OK (0.85s) Unit Tests v5 Init Tests init: add dup: init test repo ok (recording state in git...) OK (0.09s) add: add foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) add sha1foo 100% 25 B 193 KiB/s 0s ok (recording state in git...) OK (0.25s) All 2 tests passed (0.33s) add foodup 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.29s) add extras: add apple ok (recording state in git...) OK (0.23s) export_import: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) 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 48 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) Updating 51efdcf..6030788 Fast-forward (no commit created; -m option ignored) bar.c | 2 +- import | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 bar.c create mode 120000 import add import 100% 23 B 9 KiB/s 0s ok (recording state in git...) unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 8 KiB/s 0s ok (recording state in git...) list foo ok import foo import 100% 23 B 77 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...) unexport foo import ok export foo import ok (recording state in git...) OK (3.14s) export_import_subdir: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: fix subdir/foo ok BUILDSTDERR: (recording state in git...) [master fda14ea] moved 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 foo create mode 120000 subdir/foo list foo ok update refs/remotes/foo/master ok (recording state in git...) Merge made by the 'recursive' strategy. export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok Already up to date. (recording state in git...) list foo ok update refs/remotes/foo/master ok Updating c9707f7..8024a85 Fast-forward (no commit created; -m option ignored) (recording state in git...) OK (2.24s) shared clone: OK (0.14s) log: + Thu, 27 Jun 2019 06:15:47 UTC foo | e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] OK (0.16s) 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...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.78s) reinject: reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.32s) unannex (no copy): OK (0.22s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (0.50s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.60s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.67s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.35s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.41s) get (ssh remote): get foo (from origin...) 100% 20 B 739 B/s 0s (checksum...) ok (recording state in git...) OK (0.44s) move: move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (1.18s) move (ssh remote): move foo (from origin...) 100% 20 B 743 B/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 15 KiB/s 0s ok (recording state in git...) OK (1.06s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.97s) BUILDSTDERR: lock: content not present; cannot unlock add newfile 100% 3 B 1 KiB/s 0s ok (recording state in git...) BUILDSTDERR: this has not yet been committed to git; cannot unlock it get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok lock foo ok (recording state in git...) unlock foo (copying...) ok add foo 100% 31 B 12 KiB/s 0s 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 BUILDSTDERR: drop: 1 failed OK (0.63s) lock (v7 --force): upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: 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) lock foo (checksum...) ok (recording state in git...) OK (0.99s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok OK (0.44s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok OK (0.40s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok BUILDSTDERR: git-annex: Cannot make a partial commit with unlocked annexed files. You should `git annex add` the files you want to commit, and then run git commit. OK (0.32s) fix: get foo (from origin...) (checksum...) ok (recording state in git...) fix s/foo ok (recording state in git...) OK (0.43s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) direct On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok indirect (recording state in git...) On branch annex/direct/master Changes not staged for commit: typechange: foo no changes added to commit ok OK (0.46s) trust: trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.62s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa fsck foo ok fsck sha1foo ok (recording state in git...) OK (0.71s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.14s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 8382a79e-28e5-4ac2-8e45-8a2210ebe272 -- .t/tmprepo125 [here] BUILDSTDERR: e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.46s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] OK (0.49s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.22s) migrate: get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (0.92s) migrate (via gitattributes): get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (0.77s) unused: unused . (checking for unused data...) ok get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok 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 unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 2 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) ok OK (1.23s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.22s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) dir/subfile OK (0.80s) merge: merge git-annex ok OK (0.20s) info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"3e7a5b8c-0882-4c0f-9f34-3aeb2163b443","description":".t/tmprepo134"},{"here":false,"uuid":"e51fb86c-172a-4e6c-ad1d-aab217222123","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"337.67 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} OK (0.21s) version: git-annex version: 7.20190626 build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 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 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 hook external operating system: linux aarch64 supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 OK (0.16s) 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: eafc2d2..a30422d git-annex -> synced/git-annex ok foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a30422d..9074975 git-annex -> synced/git-annex ok OK (1.55s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo138 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo137 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo138 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo137 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo139 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo137 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo139 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo138 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [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 BUILDSTDERR: From ../../.t/tmprepo139 BUILDSTDERR: e0285f2..7afc50b git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo138 BUILDSTDERR: e0285f2..90f0986 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo139 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo138 BUILDSTDERR: e0285f2..a529e62 git-annex -> synced/git-annex ok OK (2.74s) adjusted branch merge regression: OK (0.28s) adjusted branch subtree regression: OK (0.18s) conflict resolution: add conflictor 100% 11 B 4 KiB/s 0s ok (recording state in git...) commit [master 00d3e32] git-annex in .t/tmprepo143 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 cd20203] git-annex in .t/tmprepo144 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo144 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 2c0f2cc] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo144 BUILDSTDERR: cd20203..2c0f2cc master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating cd20203..2c0f2cc 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 BUILDSTDERR: From ../../.t/tmprepo143 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo144 BUILDSTDERR: cd20203..2c0f2cc master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (1.41s) conflict resolution (adjusted branch): OK (0.29s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok unlock foo (copying...) ok commit [master b9aa8ec] git-annex in .t/tmprepo147 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo148 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo148 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit [master e3cc710] git-annex in .t/tmprepo148 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. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master b2bda63] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo147 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo147 BUILDSTDERR: b9aa8ec..b2bda63 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating b9aa8ec..b2bda63 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 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo148 BUILDSTDERR: af89d6d..fa60419 git-annex -> r2/git-annex BUILDSTDERR: 51efdcf..b2bda63 master -> r2/master BUILDSTDERR: b9aa8ec..b2bda63 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (1.56s) conflict resolution (mixed directory and file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 7981eae] git-annex in .t/tmprepo149 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 b6266d0] git-annex in .t/tmprepo150 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo150 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 16eac1e] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo150 BUILDSTDERR: b6266d0..16eac1e master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating b6266d0..16eac1e Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo149 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 05e6c58] git-annex in .t/tmprepo151 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 9052efd] git-annex in .t/tmprepo152 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo151 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 4a065b1] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo151 BUILDSTDERR: 05e6c58..4a065b1 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 05e6c58..4a065b1 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 BUILDSTDERR: From ../../.t/tmprepo152 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (2.85s) conflict resolution symlink bit: add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 74ba72d] git-annex in .t/tmprepo153 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 9074975..e9c8844 git-annex -> synced/git-annex BUILDSTDERR: 51efdcf..74ba72d master -> synced/master ok conflictor add conflictor/subfile 100% 7 B 3 KiB/s 0s ok (recording state in git...) commit [master 0202d3d] git-annex in .t/tmprepo154 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 9074975..e9c8844 git-annex -> origin/git-annex BUILDSTDERR: 9074975..e9c8844 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 51efdcf..74ba72d 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 9482ae2] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: e9c8844..f128fd0 git-annex -> synced/git-annex BUILDSTDERR: 74ba72d..9482ae2 master -> synced/master ok conflictor/subfile add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 828c0a4] git-annex in .t/tmprepo155 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 9074975..f128fd0 git-annex -> origin/git-annex BUILDSTDERR: 9074975..f128fd0 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 51efdcf..9482ae2 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master e1a47c3] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: f128fd0..a77b455 git-annex -> synced/git-annex BUILDSTDERR: 9482ae2..e1a47c3 master -> synced/master ok conflictor/subfile OK (2.17s) conflict resolution (uncommitted local file): add conflictor 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master 6a068e1] git-annex in .t/tmprepo156 1 file changed, 1 insertion(+) create mode 120000 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo156 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 51efdcf..6a068e1 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 51efdcf..6a068e1 BUILDSTDERR: To ../../.t/tmprepo156 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo156' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo156 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo156' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. add conflictor/file 100% 7 B 3 KiB/s 0s ok (recording state in git...) commit [master 26be000] git-annex in .t/tmprepo158 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 BUILDSTDERR: From ../../.t/tmprepo158 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 51efdcf..26be000 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 51efdcf..26be000 BUILDSTDERR: To ../../.t/tmprepo158 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo158' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo158 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo158' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. OK (1.61s) conflict resolution (removed file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 5645309] git-annex in .t/tmprepo160 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo160 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 51efdcf..5645309 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 BUILDSTDERR: To ../../.t/tmprepo160 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor (copying...) ok commit [master cb7da02] git-annex in .t/tmprepo160 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo161 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo161 BUILDSTDERR: 5645309..cb7da02 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit [master 62c36bd] git-annex in .t/tmprepo161 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 03908dd] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo160 BUILDSTDERR: 0f7ebf6..0bb9db2 git-annex -> r1/git-annex BUILDSTDERR: 5645309..cb7da02 master -> r1/master BUILDSTDERR: 5645309..cb7da02 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo160 BUILDSTDERR: 0f7ebf6..34e2d0d git-annex -> synced/git-annex BUILDSTDERR: cb7da02..03908dd master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating cb7da02..03908dd Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo161 BUILDSTDERR: 0bb9db2..34e2d0d git-annex -> r2/git-annex BUILDSTDERR: 5645309..03908dd master -> r2/master BUILDSTDERR: cb7da02..03908dd synced/master -> r2/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 3e32c5a] git-annex in .t/tmprepo162 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo162 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 51efdcf..3e32c5a 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 BUILDSTDERR: To ../../.t/tmprepo162 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor (copying...) ok commit [master 52ebf02] git-annex in .t/tmprepo163 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo162 BUILDSTDERR: 53b87d8..88cd300 git-annex -> synced/git-annex BUILDSTDERR: 3e32c5a..52ebf02 master -> synced/master ok commit [master b32687c] git-annex in .t/tmprepo162 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 706b40e] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo163 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo163 BUILDSTDERR: 52ebf02..706b40e master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 52ebf02..706b40e Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo162 BUILDSTDERR: 3e32c5a..706b40e master -> r1/master BUILDSTDERR: 52ebf02..706b40e synced/master -> r1/synced/master ok OK (3.30s) conflict resolution (nonannexed file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 5dc4321] git-annex in .t/tmprepo164 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 18a7dca] git-annex in .t/tmprepo165 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo165 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master b807fd8] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo165 BUILDSTDERR: 18a7dca..b807fd8 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 18a7dca..b807fd8 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo164 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master ffe4a22] git-annex in .t/tmprepo166 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 77263bf] git-annex in .t/tmprepo167 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo166 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 155343b] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo166 BUILDSTDERR: ffe4a22..155343b master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating ffe4a22..155343b 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 BUILDSTDERR: From ../../.t/tmprepo167 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 5d5120c] git-annex in .t/tmprepo168 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 736bdb0] git-annex in .t/tmprepo169 1 file changed, 1 insertion(+) create mode 100644 conflictor ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo169 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo169 BUILDSTDERR: 736bdb0..49d28a6 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo168 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: duplicate parent 49d28a6ee4bb66e2d9e6b5060cf1f9437a7e7901 ignored ok push r1 BUILDSTDERR: To ../../.t/tmprepo168 BUILDSTDERR: 49d28a6..73805fa annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master cadf77d] git-annex in .t/tmprepo170 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 53d469e] git-annex in .t/tmprepo171 1 file changed, 1 insertion(+) create mode 100644 conflictor ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo170 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo170 BUILDSTDERR: cadf77d..6d2ca04 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo171 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master BUILDSTDERR: error: duplicate parent 6d2ca04cdb57351c35d0938daf4b2ea04e973d2f ignored ok push r2 BUILDSTDERR: To ../../.t/tmprepo171 BUILDSTDERR: 6d2ca04..229f48f annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok OK (5.14s) conflict resolution (nonannexed symlink): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 98011ec] git-annex in .t/tmprepo172 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master c6e03fc] git-annex in .t/tmprepo173 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo173 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 2d28a8f] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo173 BUILDSTDERR: c6e03fc..2d28a8f master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating c6e03fc..2d28a8f Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo172 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master fd4c719] git-annex in .t/tmprepo174 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master a3611f4] git-annex in .t/tmprepo175 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo174 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 50c0815] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo174 BUILDSTDERR: fd4c719..50c0815 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating fd4c719..50c0815 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo175 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master d8be3d7] git-annex in .t/tmprepo176 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 7dc8edc] git-annex in .t/tmprepo177 1 file changed, 1 insertion(+) create mode 120000 conflictor ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo177 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo177 BUILDSTDERR: 7dc8edc..38fe038 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo176 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: duplicate parent 38fe0383499a37c04a7d3925153e19da0bed4caa ignored ok push r1 BUILDSTDERR: To ../../.t/tmprepo176 BUILDSTDERR: 38fe038..5f9ab8e annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 88f4a9f] git-annex in .t/tmprepo178 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 6b554d0] git-annex in .t/tmprepo179 1 file changed, 1 insertion(+) create mode 120000 conflictor ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo178 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo178 BUILDSTDERR: 88f4a9f..05d9d27 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok direct On branch master nothing to commit, working tree clean ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo179 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master BUILDSTDERR: error: duplicate parent 05d9d270bdbfe3ff40e1e0a18d8e4beb5d373a12 ignored ok push r2 BUILDSTDERR: To ../../.t/tmprepo179 BUILDSTDERR: 05d9d27..030a236 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok OK (5.19s) conflict resolution (mixed locked and unlocked file): commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo181 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull origin Updating 51efdcf..e1a47c3 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo181 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a77b455..395b93c git-annex -> synced/git-annex ok commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok merge synced/master Updating 51efdcf..e1a47c3 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok pull r1 BUILDSTDERR: From ../../.t/tmprepo180 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a77b455..395b93c git-annex -> origin/git-annex BUILDSTDERR: a77b455..395b93c synced/git-annex -> origin/synced/git-annex ok commit On branch master Your branch is ahead of 'origin/master' by 5 commits. (use "git push" to publish your local commits) nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo181 BUILDSTDERR: 51efdcf..e1a47c3 master -> r2/master ok pull origin ok OK (1.36s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot OK (0.23s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was b0d1164). BUILDSTDERR: ExitSuccess OK (0.57s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (0.19s) upgrade: upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok OK (0.47s) whereis: whereis foo (1 copy) e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 040673c9-9be9-49c2-821e-3da5c398c38f -- .t/tmprepo186 [here] The following untrusted locations may also have copies: e51fb86c-172a-4e6c-ad1d-aab217222123 -- test repo [origin] ok OK (0.42s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (0.90s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 30 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 50 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.99s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.08s) bup remote: OK (0.15s) crypto: OK (0.49s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (1.59s) add subdirs: add dir/foo 100% 24 B 8 KiB/s 0s ok (recording state in git...) commit [master 3750dfd] git-annex in .t/tmprepo195 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 395b93c..db5cbca git-annex -> synced/git-annex BUILDSTDERR: e1a47c3..3cb9277 master -> synced/master ok add ../dir2/foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.59s) BUILDSTDERR: addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo196/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo196/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo196/myurl (to _builddir_build_BUILD_git_annex_7.20190626_test_.t_tmprepo196_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo196/myurl (to addurlurldest) ok (recording state in git...) OK (0.34s) Unit Tests v7 locked add dup: Init Tests init: init test repo ok (recording state in git...) OK (0.10s) add: add foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) add sha1foo 100% 25 B 203 KiB/s 0s ok (recording state in git...) OK (0.27s) All 2 tests passed (0.38s) add foodup 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.81s) add extras: add apple ok (recording state in git...) OK (0.63s) export_import: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) 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 58 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) Updating 00f2f4b..d207679 Fast-forward (no commit created; -m option ignored) bar.c | 2 +- import | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 bar.c create mode 120000 import add import 100% 23 B 8 KiB/s 0s ok (recording state in git...) unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 7 KiB/s 0s ok (recording state in git...) list foo ok import foo import 100% 23 B 69 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 8 KiB/s 0s ok add import ok add import ok (recording state in git...) unexport foo import ok export foo import ok (recording state in git...) OK (3.75s) export_import_subdir: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: fix subdir/foo ok BUILDSTDERR: (recording state in git...) [master 96b0b26] moved 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 foo create mode 120000 subdir/foo list foo ok update refs/remotes/foo/master ok (recording state in git...) Merge made by the 'recursive' strategy. export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok Already up to date. (recording state in git...) list foo ok update refs/remotes/foo/master ok Updating 7be4f7c..4b12d34 Fast-forward (no commit created; -m option ignored) (recording state in git...) OK (2.62s) shared clone: OK (0.51s) log: + Thu, 27 Jun 2019 06:16:49 UTC foo | d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] OK (0.51s) 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...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.98s) reinject: reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.84s) unannex (no copy): OK (1.29s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (0.96s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.72s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.84s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.74s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.81s) get (ssh remote): get foo (from origin...) 100% 20 B 735 B/s 0s (checksum...) ok (recording state in git...) OK (0.80s) move: move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (1.31s) move (ssh remote): move foo (from origin...) 100% 20 B 693 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.23s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (1.05s) 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...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: 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) 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...) BUILDSTDERR: drop: 1 failed OK (1.93s) lock (v7 --force): upgrade ok get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: 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) lock foo (checksum...) ok (recording state in git...) OK (1.24s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (1.21s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) (recording state in git...) OK (1.17s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (1.37s) fix: get foo (from origin...) (checksum...) ok (recording state in git...) fix s/foo ok (recording state in git...) OK (1.03s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.84s) trust: trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.97s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa fsck foo ok fsck sha1foo ok (recording state in git...) OK (1.13s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.52s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 25b2499d-94ac-4f3e-8dca-714c3e4b9723 -- .t/tmprepo225 [here] BUILDSTDERR: d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.78s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] OK (0.92s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.57s) migrate: get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (1.33s) migrate (via gitattributes): get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (1.32s) unused: unused . (checking for unused data...) ok get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok 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 unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 2 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 4 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) ok OK (1.59s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.58s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile 100% 7 B 3 KiB/s 0s ok (recording state in git...) dir/subfile OK (1.25s) merge: merge git-annex ok OK (0.59s) info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"a26d4970-97ff-4a23-b5da-e4dd3e865749","description":".t/tmprepo234"},{"here":false,"uuid":"d975874a-cf3b-4d3e-b7b1-5cdf858b4727","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"337.6 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} OK (0.63s) version: git-annex version: 7.20190626 build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 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 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 hook external operating system: linux aarch64 supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (0.51s) 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 3d4c349..267d35e git-annex -> synced/git-annex ok foo 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 267d35e..3f81b50 git-annex -> synced/git-annex ok OK (1.70s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo238 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo237 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo238 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo237 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo239 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo237 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo239 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo238 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [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 BUILDSTDERR: From ../../.t/tmprepo239 BUILDSTDERR: 8f1a21c..c1aaf1c git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo238 BUILDSTDERR: 8f1a21c..a5fc073 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo239 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo238 BUILDSTDERR: 8f1a21c..03b56ef git-annex -> synced/git-annex ok OK (3.47s) adjusted branch merge regression: upgrade ok adjust BUILDSTDERR: 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) 73fcf51] git-annex in .t/tmprepo240 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo241 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo241 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 6b44c4f] git-annex in .t/tmprepo241 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 6b44c4f..32617e8 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo240 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo240 BUILDSTDERR: 232d6bf..5434a49 master -> synced/master BUILDSTDERR: * [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 232d6bf..5434a49 Fast-forward (Merging into adjusted branch...) Updating 3e3c72b..2de8556 Fast-forward ok pull r2 BUILDSTDERR: From ../../.t/tmprepo241 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: 92a39e4..26a4379 git-annex -> r2/git-annex BUILDSTDERR: 00f2f4b..5434a49 master -> r2/master BUILDSTDERR: 232d6bf..5434a49 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo240 BUILDSTDERR: + 3e3c72b...c34c31a adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (3.74s) adjusted branch subtree regression: upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add a/b/c/d 100% 3 B 856 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 6088fca] git-annex in .t/tmprepo242 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) a1d5d5e] git-annex in .t/tmprepo242 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok BUILDSTDERR: Switched to branch 'master' OK (1.64s) conflict resolution: add conflictor 100% 11 B 3 KiB/s 0s ok (recording state in git...) commit [master 53bfa9f] git-annex in .t/tmprepo243 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 4a82ba7] git-annex in .t/tmprepo244 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo244 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 496b09b] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo244 BUILDSTDERR: 4a82ba7..496b09b master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 4a82ba7..496b09b 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 BUILDSTDERR: From ../../.t/tmprepo243 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo244 BUILDSTDERR: 4a82ba7..496b09b master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (2.43s) conflict resolution (adjusted branch): add conflictor 100% 11 B 4 KiB/s 0s ok (recording state in git...) commit [master ada4c2a] git-annex in .t/tmprepo245 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 ee2eeec] git-annex in .t/tmprepo246 1 file changed, 1 insertion(+) create mode 120000 conflictor ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo246 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 83706cc] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo246 BUILDSTDERR: ee2eeec..83706cc master -> synced/master BUILDSTDERR: * [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 ee2eeec..83706cc 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 d7f860c..b64850e 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 BUILDSTDERR: From ../../.t/tmprepo245 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo246 BUILDSTDERR: + d7f860c...dd88db1 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (3.46s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) unlock foo ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master c4df974] git-annex in .t/tmprepo247 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo248 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo248 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit BUILDSTDERR: (recording state in git...) [master ad5a0db] git-annex in .t/tmprepo248 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. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 834938a] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo247 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo247 BUILDSTDERR: c4df974..834938a master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating c4df974..834938a 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 BUILDSTDERR: From ../../.t/tmprepo248 BUILDSTDERR: 4a3d5ca..9550375 git-annex -> r2/git-annex BUILDSTDERR: 00f2f4b..834938a master -> r2/master BUILDSTDERR: c4df974..834938a synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (5.00s) conflict resolution (mixed directory and file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master cdfd60b] git-annex in .t/tmprepo249 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master 66c56df] git-annex in .t/tmprepo250 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo250 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 90d6b50] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo250 BUILDSTDERR: 66c56df..90d6b50 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 66c56df..90d6b50 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo249 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master d560fb5] git-annex in .t/tmprepo251 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master 0e2b962] git-annex in .t/tmprepo252 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo251 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a293db1] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo251 BUILDSTDERR: d560fb5..a293db1 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating d560fb5..a293db1 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 BUILDSTDERR: From ../../.t/tmprepo252 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (5.54s) conflict resolution symlink bit: add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master b02bede] git-annex in .t/tmprepo253 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 3f81b50..c6c5c13 git-annex -> synced/git-annex BUILDSTDERR: 00f2f4b..b02bede master -> synced/master ok conflictor add conflictor/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master 831c47a] git-annex in .t/tmprepo254 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 3f81b50..c6c5c13 git-annex -> origin/git-annex BUILDSTDERR: 3f81b50..c6c5c13 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 00f2f4b..b02bede 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 885977d] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: c6c5c13..14cc293 git-annex -> synced/git-annex BUILDSTDERR: b02bede..885977d master -> synced/master ok conflictor/subfile add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 8eb11c5] git-annex in .t/tmprepo255 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 3f81b50..14cc293 git-annex -> origin/git-annex BUILDSTDERR: 3f81b50..14cc293 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 00f2f4b..885977d 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 27e629e] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 14cc293..4b9f4a7 git-annex -> synced/git-annex BUILDSTDERR: 885977d..27e629e master -> synced/master ok conflictor/subfile OK (3.39s) conflict resolution (uncommitted local file): add conflictor 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master eb85971] git-annex in .t/tmprepo256 1 file changed, 1 insertion(+) create mode 120000 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo256 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 00f2f4b..eb85971 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 00f2f4b..eb85971 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo256 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo256' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo256 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo256' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. add conflictor/file 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit [master 351abb9] git-annex in .t/tmprepo258 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 BUILDSTDERR: From ../../.t/tmprepo258 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 00f2f4b..351abb9 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 00f2f4b..351abb9 BUILDSTDERR: To ../../.t/tmprepo258 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo258' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo258 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo258' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. OK (4.57s) BUILDSTDERR: Pushing to r1 failed. conflict resolution (removed file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 699dbcf] git-annex in .t/tmprepo260 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo260 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 00f2f4b..699dbcf 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 BUILDSTDERR: To ../../.t/tmprepo260 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master 355a1b5] git-annex in .t/tmprepo260 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo261 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo261 BUILDSTDERR: 699dbcf..355a1b5 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit BUILDSTDERR: (recording state in git...) [master 5ffd88c] git-annex in .t/tmprepo261 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master b09e5c6] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo260 BUILDSTDERR: 0735432..2934c1c git-annex -> r1/git-annex BUILDSTDERR: 699dbcf..355a1b5 master -> r1/master BUILDSTDERR: 699dbcf..355a1b5 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo260 BUILDSTDERR: 0735432..ea88741 git-annex -> synced/git-annex BUILDSTDERR: 355a1b5..b09e5c6 master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 355a1b5..b09e5c6 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo261 BUILDSTDERR: 2934c1c..ea88741 git-annex -> r2/git-annex BUILDSTDERR: 699dbcf..b09e5c6 master -> r2/master BUILDSTDERR: 355a1b5..b09e5c6 synced/master -> r2/synced/master ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 8d115d5] git-annex in .t/tmprepo262 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo262 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 00f2f4b..8d115d5 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 BUILDSTDERR: To ../../.t/tmprepo262 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master 7b4bf82] git-annex in .t/tmprepo263 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo262 BUILDSTDERR: e42d02a..366210c git-annex -> synced/git-annex BUILDSTDERR: 8d115d5..7b4bf82 master -> synced/master ok commit [master 0cee348] git-annex in .t/tmprepo262 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 16fb3fd] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo263 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo263 BUILDSTDERR: 7b4bf82..16fb3fd master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 7b4bf82..16fb3fd Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo262 BUILDSTDERR: 8d115d5..16fb3fd master -> r1/master BUILDSTDERR: 7b4bf82..16fb3fd synced/master -> r1/synced/master ok OK (7.78s) conflict resolution (nonannexed file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 3151db2] git-annex in .t/tmprepo264 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 4a58fa7] git-annex in .t/tmprepo265 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo265 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a1377f2] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo265 BUILDSTDERR: 4a58fa7..a1377f2 master -> synced/master BUILDSTDERR: * [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 4a58fa7..a1377f2 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo264 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 1b877a1] git-annex in .t/tmprepo266 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master ea3a38d] git-annex in .t/tmprepo267 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo266 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 883a4b3] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo266 BUILDSTDERR: 1b877a1..883a4b3 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 1b877a1..883a4b3 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 BUILDSTDERR: From ../../.t/tmprepo267 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 4e912fd] git-annex in .t/tmprepo268 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 455de82] git-annex in .t/tmprepo269 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo269 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master eaf13b9] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo269 BUILDSTDERR: 455de82..eaf13b9 master -> synced/master BUILDSTDERR: * [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 455de82..eaf13b9 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo268 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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 bd560ba] git-annex in .t/tmprepo270 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master a206e32] git-annex in .t/tmprepo271 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo270 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 1e081c5] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo270 BUILDSTDERR: bd560ba..1e081c5 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating bd560ba..1e081c5 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 BUILDSTDERR: From ../../.t/tmprepo271 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (10.46s) conflict resolution (nonannexed symlink): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 2abb518] git-annex in .t/tmprepo272 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 5840b8b] git-annex in .t/tmprepo273 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo273 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master f19b36c] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo273 BUILDSTDERR: 5840b8b..f19b36c master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 5840b8b..f19b36c Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo272 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 8c7e607] git-annex in .t/tmprepo274 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 87a9195] git-annex in .t/tmprepo275 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo274 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 189806a] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo274 BUILDSTDERR: 8c7e607..189806a master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 8c7e607..189806a Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo275 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 494197d] git-annex in .t/tmprepo276 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master e325e12] git-annex in .t/tmprepo277 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo277 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master c49dc08] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo277 BUILDSTDERR: e325e12..c49dc08 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e325e12..c49dc08 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo276 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit [master 42beedf] git-annex in .t/tmprepo278 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 726e2dd] git-annex in .t/tmprepo279 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo278 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 304a7ea] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo278 BUILDSTDERR: 42beedf..304a7ea master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 42beedf..304a7ea Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo279 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (9.24s) conflict resolution (mixed locked and unlocked file): add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit [master 252f942] git-annex in .t/tmprepo280 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 b8b0f52] git-annex in .t/tmprepo281 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo281 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. BUILDSTDERR: 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 88e9c97] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo281 BUILDSTDERR: b8b0f52..88e9c97 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating b8b0f52..88e9c97 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo280 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo281 BUILDSTDERR: b8b0f52..88e9c97 master -> r2/master ok conflictor conflictor OK (3.90s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot OK (0.82s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was daf6325). BUILDSTDERR: ExitSuccess OK (0.90s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (1.23s) upgrade: upgrade ok OK (0.57s) whereis: whereis foo (1 copy) d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 8e21eb8f-5476-4ea0-991f-5b9857501f36 -- .t/tmprepo286 [here] The following untrusted locations may also have copies: d975874a-cf3b-4d3e-b7b1-5cdf858b4727 -- test repo [origin] ok OK (0.85s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (1.20s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 27 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 45 KiB/s 0s (checksum...) ok (recording state in git...) OK (1.27s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.54s) bup remote: OK (0.86s) crypto: OK (2.08s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (1.85s) add subdirs: add dir/foo 100% 24 B 7 KiB/s 0s ok (recording state in git...) commit [master 641c336] git-annex in .t/tmprepo295 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 BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 4b9f4a7..1c48a91 git-annex -> synced/git-annex BUILDSTDERR: 27e629e..e07032b master -> synced/master ok add ../dir2/foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (1.17s) BUILDSTDERR: addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo296/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo296/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo296/myurl (to _builddir_build_BUILD_git_annex_7.20190626_test_.t_tmprepo296_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo296/myurl (to addurlurldest) ok (recording state in git...) OK (0.96s) Unit Tests v5 direct add dup: Init Tests init: init test repo ok (recording state in git...) On branch master Initial commit nothing to commit OK (0.15s) add: add foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) add sha1foo 100% 25 B 202 KiB/s 0s ok (recording state in git...) BUILDSTDERR: fatal: this operation must be run in a work tree commit ok OK (0.25s) All 2 tests passed (0.39s) On branch master nothing to commit, working tree clean add foodup 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.40s) add extras: On branch master nothing to commit, working tree clean add apple ok (recording state in git...) OK (0.31s) export_import: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.29s) export_import_subdir: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.26s) shared clone: On branch master nothing to commit, working tree clean OK (0.22s) log: On branch master nothing to commit, working tree clean + Thu, 27 Jun 2019 06:18:53 UTC foo | 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] OK (0.27s) import: On branch master nothing to commit, working tree clean 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...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.64s) reinject: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.30s) unannex (no copy): On branch master nothing to commit, working tree clean OK (0.28s) unannex (with copy): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok (recording state in git...) OK (0.38s) drop (no remote): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.48s) drop (with remote): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (1.16s) drop (untrusted remote): On branch master nothing to commit, working tree clean untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.46s) get: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.48s) get (ssh remote): On branch master nothing to commit, working tree clean get foo (from origin...) 100% 20 B 712 B/s 0s (checksum...) ok (recording state in git...) OK (0.51s) move: On branch master nothing to commit, working tree clean move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (0.81s) move (ssh remote): On branch master nothing to commit, working tree clean move foo (from origin...) 100% 20 B 717 B/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 8 KiB/s 0s ok (recording state in git...) OK (0.92s) copy: On branch master nothing to commit, working tree clean copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.74s) lock: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.28s) lock (v7 --force): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.68s) edit (no pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.25s) edit (pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.25s) partial commit: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.26s) fix: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.29s) direct: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.28s) trust: On branch master nothing to commit, working tree clean trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.70s) fsck (basics): On branch master nothing to commit, working tree clean fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) OK (0.83s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.19s) fsck (local untrusted): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 080a8438-fc9d-4539-ac3e-97296cb0259d -- .t/tmprepo325 [here] BUILDSTDERR: 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.54s) fsck (remote untrusted): On branch master nothing to commit, working tree clean numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] OK (0.55s) fsck --from remote: On branch master nothing to commit, working tree clean fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.84s) migrate: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.49s) migrate (via gitattributes): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.47s) unused: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.32s) describe: On branch master nothing to commit, working tree clean describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.28s) find: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) dir/subfile OK (0.91s) merge: On branch master nothing to commit, working tree clean merge git-annex ok OK (0.26s) info: On branch master nothing to commit, working tree clean {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":false,"uuid":"5a31274f-d6bd-4d19-8578-c58e56f45465","description":"test repo [origin]"},{"here":true,"uuid":"8ed11786-0ce7-44b9-b3fa-696424a793e8","description":".t/tmprepo334"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"direct","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"337.53 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} OK (0.29s) version: On branch master nothing to commit, working tree clean git-annex version: 7.20190626 build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 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 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 hook external operating system: linux aarch64 supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 OK (0.22s) sync: On branch master nothing to commit, working tree clean commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get foo (from origin...) (checksum...) ok (recording state in git...) foo wanted . ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 04957b0..6ac2a43 git-annex -> synced/git-annex ok foo drop foo ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 6ac2a43..a9f403f git-annex -> synced/git-annex ok OK (1.38s) union merge regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo338 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo337 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo338 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo337 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo339 BUILDSTDERR: * [new branch] annex/direct/master -> r3/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo337 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo339 BUILDSTDERR: * [new branch] annex/direct/master -> r3/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo338 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo339 BUILDSTDERR: a156fa6..216a002 git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo338 BUILDSTDERR: a156fa6..3cfa092 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo339 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo338 BUILDSTDERR: a156fa6..d13731b git-annex -> synced/git-annex ok OK (2.59s) adjusted branch merge regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.45s) adjusted branch subtree regression: On branch master nothing to commit, working tree clean OK (0.24s) conflict resolution: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 11 B 4 KiB/s 0s ok (recording state in git...) commit ok add conflictor 100% 11 B 4 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo344 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo344 BUILDSTDERR: c1a3474..52932ad annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo343 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo344 BUILDSTDERR: c1a3474..52932ad annex/direct/master -> r2/annex/direct/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (1.78s) conflict resolution (adjusted branch): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.45s) conflict resolution movein regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) commit add foo ok (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo348 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo348 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok commit add foo ok (recording state in git...) ok merge synced/master Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r1 BUILDSTDERR: From ../../.t/tmprepo347 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo347 BUILDSTDERR: 7be4faa..20d4f8e annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo348 BUILDSTDERR: 237fa33..20d4f8e annex/direct/master -> r2/annex/direct/master BUILDSTDERR: d804c7a..7c0885f git-annex -> r2/git-annex BUILDSTDERR: 7be4faa..20d4f8e master -> r2/master BUILDSTDERR: 7be4faa..20d4f8e synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (1.67s) conflict resolution (mixed directory and file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit ok add conflictor/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo350 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo350 BUILDSTDERR: 2117b44..0057abc annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo349 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit ok add conflictor/subfile 100% 7 B 3 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo351 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo351 BUILDSTDERR: d8586b2..2457b84 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master Adding conflictor/subfile BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo352 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (3.36s) conflict resolution symlink bit: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 10 B 3 KiB/s 0s ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a9f403f..e6d9d41 git-annex -> synced/git-annex BUILDSTDERR: 237fa33..69611aa annex/direct/master -> synced/master ok conflictor add conflictor/subfile 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a9f403f..e6d9d41 git-annex -> origin/git-annex BUILDSTDERR: 237fa33..69611aa master -> origin/master BUILDSTDERR: a9f403f..e6d9d41 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 237fa33..69611aa 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_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: e6d9d41..324c59c git-annex -> synced/git-annex BUILDSTDERR: 69611aa..5368267 annex/direct/master -> synced/master ok conflictor/subfile add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: a9f403f..324c59c git-annex -> origin/git-annex BUILDSTDERR: 237fa33..5368267 master -> origin/master BUILDSTDERR: a9f403f..324c59c synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 237fa33..5368267 synced/master -> origin/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 324c59c..011fa9b git-annex -> synced/git-annex BUILDSTDERR: 5368267..ed0da8c annex/direct/master -> synced/master ok conflictor/subfile OK (2.21s) conflict resolution (uncommitted local file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 7 B 3 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo356 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent e7abf964dbb3f8e662b667c372f90625636ab099 ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo356 BUILDSTDERR: e7abf96..0e7104c annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor/file 100% 7 B 2 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo358 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 729268592df68b73cb6edba546875e1710e3c898 ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo358 BUILDSTDERR: 7292685..17b2fca annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor/file (from r1...) (checksum...) ok (recording state in git...) OK (2.31s) conflict resolution (removed file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo360 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 5f3e2ac652490ecbfa9f8ff33ba96237e1c08552 ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo360 BUILDSTDERR: 5f3e2ac..988a33b annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit (recording state in git...) ok merge synced/master Already up to date! BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo361 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo361 BUILDSTDERR: 988a33b..8458f7c annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit add conflictor ok (recording state in git...) 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r1 BUILDSTDERR: From ../../.t/tmprepo360 BUILDSTDERR: 5f3e2ac..8458f7c annex/direct/master -> r1/annex/direct/master BUILDSTDERR: ddbb308..f5d7a52 git-annex -> r1/git-annex BUILDSTDERR: 988a33b..8458f7c master -> r1/master BUILDSTDERR: 988a33b..8458f7c synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo360 BUILDSTDERR: ddbb308..f5d7a52 git-annex -> synced/git-annex BUILDSTDERR: 8458f7c..df2dc94 annex/direct/master -> synced/master ok (recording state in git...) commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo361 BUILDSTDERR: 988a33b..df2dc94 annex/direct/master -> r2/annex/direct/master BUILDSTDERR: f5d7a52..aeeced4 git-annex -> r2/git-annex BUILDSTDERR: 8458f7c..df2dc94 master -> r2/master BUILDSTDERR: 8458f7c..df2dc94 synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor 100% 10 B 4 KiB/s 0s ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo362 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent a5a51bb76cb1afe2ced3d441ce7711f4a06b1f3d ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo362 BUILDSTDERR: a5a51bb..1e90b16 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit add conflictor ok (recording state in git...) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo362 BUILDSTDERR: 2e96788..c02d4e5 git-annex -> synced/git-annex BUILDSTDERR: 1e90b16..73f7713 annex/direct/master -> synced/master ok (recording state in git...) commit (recording state in git...) 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. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r2 BUILDSTDERR: From ../../.t/tmprepo363 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo363 BUILDSTDERR: 73f7713..12bfb06 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo362 BUILDSTDERR: a5a51bb..12bfb06 annex/direct/master -> r1/annex/direct/master BUILDSTDERR: c02d4e5..bf27b83 git-annex -> r1/git-annex BUILDSTDERR: 73f7713..12bfb06 master -> r1/master BUILDSTDERR: 73f7713..12bfb06 synced/master -> r1/synced/master ok OK (4.02s) conflict resolution (nonannexed file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (2.03s) conflict resolution (nonannexed symlink): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (1.96s) conflict resolution (mixed locked and unlocked file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo381 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull origin BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent ed0da8cd77edd9ed5d7ff27be60489fbb2999600 ignored ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo381 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 011fa9b..8e29c7b git-annex -> synced/git-annex BUILDSTDERR: ed0da8c..94957a8 annex/direct/master -> synced/master ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo380 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 011fa9b..8e29c7b git-annex -> origin/git-annex BUILDSTDERR: ed0da8c..94957a8 master -> origin/master BUILDSTDERR: 011fa9b..8e29c7b synced/git-annex -> origin/synced/git-annex BUILDSTDERR: ed0da8c..94957a8 synced/master -> origin/synced/master ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo381 BUILDSTDERR: 237fa33..94957a8 annex/direct/master -> r2/annex/direct/master ok pull origin ok OK (1.51s) map: On branch master nothing to commit, working tree clean describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot OK (0.33s) uninit: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was 9d28a01). BUILDSTDERR: ExitSuccess OK (0.51s) uninit (in git-annex branch): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.26s) upgrade: On branch master nothing to commit, working tree clean upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok (recording state in git...) OK (0.73s) whereis: On branch master nothing to commit, working tree clean whereis foo (1 copy) 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) a34bd067-3cfe-4506-b795-af4aac328389 -- .t/tmprepo386 [here] The following untrusted locations may also have copies: 5a31274f-d6bd-4d19-8578-c58e56f45465 -- test repo [origin] ok OK (0.55s) hook remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (1.17s) directory remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 27 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 47 KiB/s 0s (checksum...) ok (recording state in git...) OK (1.10s) rsync remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (0.97s) bup remote: On branch master nothing to commit, working tree clean OK (0.24s) crypto: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.73s) preferred content: On branch master nothing to commit, working tree clean wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (1.41s) add subdirs: On branch master nothing to commit, working tree clean add dir/foo 100% 24 B 9 KiB/s 0s ok (recording state in git...) commit ok pull origin BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190626/test/.t/repo BUILDSTDERR: 8e29c7b..650faca git-annex -> synced/git-annex BUILDSTDERR: 94957a8..ca7937b annex/direct/master -> synced/master ok add ../dir2/foo 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.75s) addurl: On branch master nothing to commit, working tree clean BUILDSTDERR: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo396/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo396/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo396/myurl (to _builddir_build_BUILD_git_annex_7.20190626_test_.t_tmprepo396_myurl) (recording state in git...) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190626/test/.t/tmprepo396/myurl (to addurlurldest) (recording state in git...) ok OK (0.46s) All 300 tests passed (414.03s) + popd ~/build/BUILD/git-annex-7.20190626 + exit 0 Processing files: git-annex-7.20190626-1.fc30.aarch64 Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.C72vbO + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.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.20190626-1.fc30.aarch64/usr/share/doc/git-annex + cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/doc/git-annex + cp -pr NEWS /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/doc/git-annex + cp -pr README /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/doc/git-annex + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.uJ1ZiA + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.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.20190626-1.fc30.aarch64/usr/share/licenses/git-annex + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex + exit 0 Provides: git-annex = 7.20190626-1.fc30 git-annex(aarch-64) = 7.20190626-1.fc30 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.20190626-1.fc30.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.uQHsRX + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.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.20190626-1.fc30.aarch64/usr/share/doc/git-annex-docs + cp -pr html/ /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/doc/git-annex-docs + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.6U80xp + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.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.20190626-1.fc30.aarch64/usr/share/licenses/git-annex-docs + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex-docs + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex-docs + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64/usr/share/licenses/git-annex-docs + exit 0 Provides: git-annex-docs = 7.20190626-1.fc30 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.20190626-1.fc30.aarch64 Wrote: /builddir/build/RPMS/git-annex-7.20190626-1.fc30.aarch64.rpm Wrote: /builddir/build/RPMS/git-annex-docs-7.20190626-1.fc30.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.OQjaxt + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190626 + /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-7.20190626-1.fc30.aarch64 + exit 0 Child return code was: 0