Mock Version: 1.4.19 Mock Version: 1.4.19 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target armv7hl --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f30-build-17958744-1287741/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=201600uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target armv7hl --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: armv7hl Building for target armv7hl Wrote: /builddir/build/SRPMS/git-annex-7.20191024-1.fc30.src.rpm Child return code was: 0 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target armv7hl --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f30-build-17958744-1287741/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=201600uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target armv7hl --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: armv7hl Building for target armv7hl Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.ayeL5S + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf git-annex-7.20191024 + /usr/bin/gzip -dc /builddir/build/SOURCES/git-annex-7.20191024.tar.gz + /usr/bin/tar -xof - + STATUS=0 + '[' 0 -ne 0 ']' + cd git-annex-7.20191024 + /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.DkClFW + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + 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 -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard' + 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 ++ 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 -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard ++ sed -e 's/ / -optc/g' ++ echo ' -Wl,-z,relro' -Wl,--as-needed ++ sed -e 's/ / -optl/g' + ./Setup configure --prefix=/usr --libdir=/usr/lib --docdir=/usr/share/licenses/git-annex '--libsubdir=$compiler/$pkgid' '--datasubdir=$pkgid' '--libexecsubdir=$pkgid' --ghc --dynlibdir=/usr/lib --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-march=armv7-a -optc-mfpu=vfpv3-d16 -optc-mtune=generic-armv7-a -optc-mabi=aapcs-linux -optc-mfloat-abi=hard -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 checking ssh connection caching...fatal: not a git repository (or any of the parent directories): .git yes Configuring git-annex-7.20191024... + '[' -x Setup ']' + LANG=C.utf8 + ./Setup build Preprocessing executable 'git-annex' for git-annex-7.20191024.. Building executable 'git-annex' for git-annex-7.20191024.. [ 1 of 628] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o ) [ 2 of 628] Compiling Assistant.Types.ThreadName ( Assistant/Types/ThreadName.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.o ) [ 3 of 628] Compiling Assistant.Types.TransferSlots ( Assistant/Types/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.o ) [ 4 of 628] Compiling BuildFlags ( BuildFlags.hs, dist/build/git-annex/git-annex-tmp/BuildFlags.o ) [ 5 of 628] Compiling BuildInfo ( BuildInfo.hs, dist/build/git-annex/git-annex-tmp/BuildInfo.o ) [ 6 of 628] Compiling Build.BundledPrograms ( Build/BundledPrograms.hs, dist/build/git-annex/git-annex-tmp/Build/BundledPrograms.o ) [ 7 of 628] Compiling Config.Cost ( Config/Cost.hs, dist/build/git-annex/git-annex-tmp/Config/Cost.o ) [ 8 of 628] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o ) [ 9 of 628] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o ) [ 10 of 628] Compiling Types.BranchState ( Types/BranchState.hs, dist/build/git-annex/git-annex-tmp/Types/BranchState.o ) [ 11 of 628] Compiling Types.Creds ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o ) [ 12 of 628] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o ) [ 13 of 628] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o ) [ 14 of 628] Compiling Types.Key ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o ) [ 15 of 628] Compiling Types.Mime ( Types/Mime.hs, dist/build/git-annex/git-annex-tmp/Types/Mime.o ) [ 16 of 628] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o ) [ 17 of 628] Compiling Types.WorkerPool ( Types/WorkerPool.hs, dist/build/git-annex/git-annex-tmp/Types/WorkerPool.o ) [ 18 of 628] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o ) [ 19 of 628] Compiling Utility.Bloom ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o ) [ 20 of 628] Compiling Utility.Data ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o ) [ 21 of 628] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o ) [ 22 of 628] Compiling Utility.Dot ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o ) [ 23 of 628] Compiling Utility.Env ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o ) [ 24 of 628] Compiling Utility.Env.Set ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o ) [ 25 of 628] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o ) [ 26 of 628] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o ) [ 27 of 628] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o ) [ 28 of 628] Compiling Build.Mans ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o ) [ 29 of 628] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o ) [ 30 of 628] Compiling Git.FileMode ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o ) [ 31 of 628] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o ) [ 32 of 628] Compiling Utility.GitLFS ( Utility/GitLFS.hs, dist/build/git-annex/git-annex-tmp/Utility/GitLFS.o ) [ 33 of 628] Compiling Utility.Glob ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o ) [ 34 of 628] Compiling Utility.Hash ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o ) [ 35 of 628] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o ) [ 36 of 628] Compiling Utility.HttpManagerRestricted ( Utility/HttpManagerRestricted.hs, dist/build/git-annex/git-annex-tmp/Utility/HttpManagerRestricted.o ) [ 37 of 628] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o ) [ 38 of 628] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o ) [ 39 of 628] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o ) [ 40 of 628] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o ) [ 41 of 628] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o ) [ 42 of 628] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o ) [ 43 of 628] Compiling Utility.MD5 ( Utility/MD5.hs, dist/build/git-annex/git-annex-tmp/Utility/MD5.o ) [ 44 of 628] Compiling Utility.Misc ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o ) [ 45 of 628] Compiling Utility.Monad ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o ) [ 46 of 628] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o ) [ 47 of 628] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o ) [ 48 of 628] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o ) [ 49 of 628] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o ) [ 50 of 628] Compiling Types.LockCache ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o ) [ 51 of 628] Compiling Build.Version ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o ) [ 52 of 628] Compiling Utility.Mounts ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o ) [ 53 of 628] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o ) [ 54 of 628] Compiling Utility.PID ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o ) [ 55 of 628] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o ) [ 56 of 628] Compiling Utility.Format ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o ) [ 57 of 628] Compiling Utility.DBus ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o ) [ 58 of 628] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o ) [ 59 of 628] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o ) [ 60 of 628] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o ) [ 61 of 628] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o ) [ 62 of 628] Compiling Utility.Process ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o ) [ 63 of 628] Compiling Utility.Network ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o ) [ 64 of 628] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o ) [ 65 of 628] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o ) [ 66 of 628] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o ) [ 67 of 628] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o ) [ 68 of 628] Compiling Utility.Split ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o ) [ 69 of 628] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o ) [ 70 of 628] Compiling Utility.Shell ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o ) [ 71 of 628] Compiling Git.Types ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o ) [ 72 of 628] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o ) [ 73 of 628] Compiling Utility.Base64 ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o ) [ 74 of 628] Compiling Utility.Aeson ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o ) [ 75 of 628] Compiling Types.Messages ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o ) [ 76 of 628] Compiling Database.Handle ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o ) [ 77 of 628] Compiling Database.Queue ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o ) [ 78 of 628] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o ) [ 79 of 628] Compiling Utility.SshHost ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o ) [ 80 of 628] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o ) [ 81 of 628] Compiling Utility.Tense ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o ) [ 82 of 628] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o ) [ 83 of 628] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o ) [ 84 of 628] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o ) [ 85 of 628] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o ) [ 86 of 628] Compiling Annex.VectorClock ( Annex/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock.o ) [ 87 of 628] Compiling Utility.Tmp ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o ) [ 88 of 628] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o ) [ 89 of 628] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o ) [ 90 of 628] Compiling Utility.Tmp.Dir ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o ) [ 91 of 628] Compiling Utility.Touch ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o ) [ 92 of 628] Compiling Utility.Tuple ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o ) [ 93 of 628] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o ) [ 94 of 628] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o ) [ 95 of 628] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o ) [ 96 of 628] Compiling Utility.Path ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o ) [ 97 of 628] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o ) [ 98 of 628] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o ) [ 99 of 628] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o ) [100 of 628] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o ) [101 of 628] Compiling Common ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o ) [102 of 628] Compiling Utility.Tor ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o ) [103 of 628] Compiling Utility.TList ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o ) [104 of 628] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o ) [105 of 628] Compiling Utility.Su ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o ) [106 of 628] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o ) [107 of 628] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o ) [108 of 628] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o ) [109 of 628] Compiling Types.UUID ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o ) [110 of 628] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o ) [111 of 628] Compiling Types.RemoteState ( Types/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Types/RemoteState.o ) [112 of 628] Compiling Types.NumCopies ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o ) [113 of 628] Compiling Types.Group ( Types/Group.hs, dist/build/git-annex/git-annex-tmp/Types/Group.o ) [114 of 628] Compiling Utility.Parallel ( Utility/Parallel.hs, dist/build/git-annex/git-annex-tmp/Utility/Parallel.o ) [115 of 628] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o ) [116 of 628] Compiling Utility.Metered ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o ) [117 of 628] Compiling Utility.Url ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o ) [118 of 628] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o ) [119 of 628] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o ) [120 of 628] Compiling Utility.Rsync ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o ) [121 of 628] Compiling Utility.Matcher ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o ) [122 of 628] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o ) [123 of 628] Compiling Utility.Lsof ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o ) [124 of 628] Compiling Utility.LogFile ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o ) [125 of 628] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o ) [126 of 628] Compiling Types.KeySource ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o ) [127 of 628] Compiling Types.Backend ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o ) [128 of 628] Compiling Utility.Gpg ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o ) [129 of 628] Compiling Types.Crypto ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o ) [130 of 628] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o ) [131 of 628] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o ) [132 of 628] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o ) [133 of 628] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o ) [134 of 628] Compiling Utility.Daemon ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o ) [135 of 628] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o ) [136 of 628] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o ) [137 of 628] Compiling Utility.Batch ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o ) [138 of 628] Compiling Utility.Android ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o ) [139 of 628] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o ) [140 of 628] Compiling Types.RefSpec ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o ) [141 of 628] Compiling Types.MetaData ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o ) [142 of 628] Compiling Annex.MetaData.StandardFields ( Annex/MetaData/StandardFields.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.o ) [143 of 628] Compiling Logs.Line ( Logs/Line.hs, dist/build/git-annex/git-annex-tmp/Logs/Line.o ) [144 of 628] Compiling Logs.MapLog ( Logs/MapLog.hs, dist/build/git-annex/git-annex-tmp/Logs/MapLog.o ) [145 of 628] Compiling Logs.UUIDBased ( Logs/UUIDBased.hs, dist/build/git-annex/git-annex-tmp/Logs/UUIDBased.o ) [146 of 628] Compiling Key ( Key.hs, dist/build/git-annex/git-annex-tmp/Key.o ) [147 of 628] Compiling Messages.JSON ( Messages/JSON.hs, dist/build/git-annex/git-annex-tmp/Messages/JSON.o ) [148 of 628] Compiling Git.Version ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o ) [149 of 628] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o ) [150 of 628] Compiling Git.Ssh ( Git/Ssh.hs, dist/build/git-annex/git-annex-tmp/Git/Ssh.o ) [151 of 628] Compiling Git.Sha ( Git/Sha.hs, dist/build/git-annex/git-annex-tmp/Git/Sha.o ) [152 of 628] Compiling Git.LockFile ( Git/LockFile.hs, dist/build/git-annex/git-annex-tmp/Git/LockFile.o ) [153 of 628] Compiling Git.Filename ( Git/Filename.hs, dist/build/git-annex/git-annex-tmp/Git/Filename.o ) [154 of 628] Compiling Git ( Git.hs, dist/build/git-annex/git-annex-tmp/Git.o ) [155 of 628] Compiling Git.Url ( Git/Url.hs, dist/build/git-annex/git-annex-tmp/Git/Url.o ) [156 of 628] Compiling Git.Remote ( Git/Remote.hs, dist/build/git-annex/git-annex-tmp/Git/Remote.o ) [157 of 628] Compiling Git.Objects ( Git/Objects.hs, dist/build/git-annex/git-annex-tmp/Git/Objects.o ) [158 of 628] Compiling Git.Index ( Git/Index.hs, dist/build/git-annex/git-annex-tmp/Git/Index.o ) [159 of 628] Compiling Git.Hook ( Git/Hook.hs, dist/build/git-annex/git-annex-tmp/Git/Hook.o ) [160 of 628] Compiling Git.FilePath ( Git/FilePath.hs, dist/build/git-annex/git-annex-tmp/Git/FilePath.o ) [161 of 628] Compiling Types.Export ( Types/Export.hs, dist/build/git-annex/git-annex-tmp/Types/Export.o ) [162 of 628] Compiling Types.Import ( Types/Import.hs, dist/build/git-annex/git-annex-tmp/Types/Import.o ) [163 of 628] Compiling Database.Types ( Database/Types.hs, dist/build/git-annex/git-annex-tmp/Database/Types.o ) [164 of 628] Compiling Git.DiffTreeItem ( Git/DiffTreeItem.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTreeItem.o ) [165 of 628] Compiling Database.Keys.SQL ( Database/Keys/SQL.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/SQL.o ) [166 of 628] Compiling Git.Env ( Git/Env.hs, dist/build/git-annex/git-annex-tmp/Git/Env.o ) [167 of 628] Compiling Git.Command ( Git/Command.hs, dist/build/git-annex/git-annex-tmp/Git/Command.o ) [168 of 628] Compiling Git.UpdateIndex ( Git/UpdateIndex.hs, dist/build/git-annex/git-annex-tmp/Git/UpdateIndex.o ) [169 of 628] Compiling Git.Status ( Git/Status.hs, dist/build/git-annex/git-annex-tmp/Git/Status.o ) [170 of 628] Compiling Git.Remote.Remove ( Git/Remote/Remove.hs, dist/build/git-annex/git-annex-tmp/Git/Remote/Remove.o ) [171 of 628] Compiling Git.RefLog ( Git/RefLog.hs, dist/build/git-annex/git-annex-tmp/Git/RefLog.o ) [172 of 628] Compiling Git.Ref ( Git/Ref.hs, dist/build/git-annex/git-annex-tmp/Git/Ref.o ) [173 of 628] Compiling Git.Queue ( Git/Queue.hs, dist/build/git-annex/git-annex-tmp/Git/Queue.o ) [174 of 628] Compiling Git.LsTree ( Git/LsTree.hs, dist/build/git-annex/git-annex-tmp/Git/LsTree.o ) [175 of 628] Compiling Git.Tree ( Git/Tree.hs, dist/build/git-annex/git-annex-tmp/Git/Tree.o ) [176 of 628] Compiling Git.LsFiles ( Git/LsFiles.hs, dist/build/git-annex/git-annex-tmp/Git/LsFiles.o ) [177 of 628] Compiling Git.History ( Git/History.hs, dist/build/git-annex/git-annex-tmp/Git/History.o ) [178 of 628] Compiling Git.HashObject ( Git/HashObject.hs, dist/build/git-annex/git-annex-tmp/Git/HashObject.o ) [179 of 628] Compiling Git.Fsck ( Git/Fsck.hs, dist/build/git-annex/git-annex-tmp/Git/Fsck.o ) [180 of 628] Compiling Git.DiffTree ( Git/DiffTree.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTree.o ) [181 of 628] Compiling Git.Credential ( Git/Credential.hs, dist/build/git-annex/git-annex-tmp/Git/Credential.o ) [182 of 628] Compiling Git.Command.Batch ( Git/Command/Batch.hs, dist/build/git-annex/git-annex-tmp/Git/Command/Batch.o ) [183 of 628] Compiling Git.CheckIgnore ( Git/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Git/CheckIgnore.o ) [184 of 628] Compiling Git.CheckAttr ( Git/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Git/CheckAttr.o ) [185 of 628] Compiling Git.CatFile ( Git/CatFile.hs, dist/build/git-annex/git-annex-tmp/Git/CatFile.o ) [186 of 628] Compiling Git.UnionMerge ( Git/UnionMerge.hs, dist/build/git-annex/git-annex-tmp/Git/UnionMerge.o ) [187 of 628] Compiling Annex.AdjustedBranch.Name ( Annex/AdjustedBranch/Name.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch/Name.o ) [188 of 628] Compiling Config.DynamicConfig ( Config/DynamicConfig.hs, dist/build/git-annex/git-annex-tmp/Config/DynamicConfig.o ) [189 of 628] Compiling Annex.Magic ( Annex/Magic.hs, dist/build/git-annex/git-annex-tmp/Annex/Magic.o ) [190 of 628] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o ) [191 of 628] Compiling Build.Configure ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o ) [192 of 628] Compiling Utility.OSX ( Utility/OSX.hs, dist/build/git-annex/git-annex-tmp/Utility/OSX.o ) [193 of 628] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, dist/build/git-annex/git-annex-tmp/Utility/FreeDesktop.o ) [194 of 628] Compiling Config.Files ( Config/Files.hs, dist/build/git-annex/git-annex-tmp/Config/Files.o ) [195 of 628] Compiling Annex.Path ( Annex/Path.hs, dist/build/git-annex/git-annex-tmp/Annex/Path.o ) [196 of 628] Compiling Annex.Multicast ( Annex/Multicast.hs, dist/build/git-annex/git-annex-tmp/Annex/Multicast.o ) [197 of 628] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/Menu.o ) [198 of 628] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/AutoStart.o ) [199 of 628] Compiling Build.DesktopFile ( Build/DesktopFile.hs, dist/build/git-annex/git-annex-tmp/Build/DesktopFile.o ) [200 of 628] Compiling Git.Construct ( Git/Construct.hs, dist/build/git-annex/git-annex-tmp/Git/Construct.o ) [201 of 628] Compiling Git.Config ( Git/Config.hs, dist/build/git-annex/git-annex-tmp/Git/Config.o ) [202 of 628] Compiling Types.Distribution ( Types/Distribution.hs, dist/build/git-annex/git-annex-tmp/Types/Distribution.o ) [203 of 628] Compiling Types.Difference ( Types/Difference.hs, dist/build/git-annex/git-annex-tmp/Types/Difference.o ) [204 of 628] Compiling Git.GCrypt ( Git/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Git/GCrypt.o ) [205 of 628] Compiling Git.CurrentRepo ( Git/CurrentRepo.hs, dist/build/git-annex/git-annex-tmp/Git/CurrentRepo.o ) [206 of 628] Compiling Git.ConfigTypes ( Git/ConfigTypes.hs, dist/build/git-annex/git-annex-tmp/Git/ConfigTypes.o ) [207 of 628] Compiling Types.GitConfig ( Types/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Types/GitConfig.o ) [208 of 628] Compiling Types.Remote ( Types/Remote.hs, dist/build/git-annex/git-annex-tmp/Types/Remote.o ) [209 of 628] Compiling Types.StandardGroups ( Types/StandardGroups.hs, dist/build/git-annex/git-annex-tmp/Types/StandardGroups.o ) [210 of 628] Compiling Annex.SpecialRemote.Config ( Annex/SpecialRemote/Config.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote/Config.o ) [211 of 628] Compiling Annex.DirHashes ( Annex/DirHashes.hs, dist/build/git-annex/git-annex-tmp/Annex/DirHashes.o ) [212 of 628] Compiling Git.Branch ( Git/Branch.hs, dist/build/git-annex/git-annex-tmp/Git/Branch.o ) [213 of 628] Compiling Git.Repair ( Git/Repair.hs, dist/build/git-annex/git-annex-tmp/Git/Repair.o ) [214 of 628] Compiling Git.Merge ( Git/Merge.hs, dist/build/git-annex/git-annex-tmp/Git/Merge.o ) [215 of 628] Compiling Git.AutoCorrect ( Git/AutoCorrect.hs, dist/build/git-annex/git-annex-tmp/Git/AutoCorrect.o ) [216 of 628] Compiling Annex.Fixup ( Annex/Fixup.hs, dist/build/git-annex/git-annex-tmp/Annex/Fixup.o ) [217 of 628] Compiling Annex.Locations ( Annex/Locations.hs, dist/build/git-annex/git-annex-tmp/Annex/Locations.o ) [218 of 628] Compiling Annex ( Annex.hs, dist/build/git-annex/git-annex-tmp/Annex.o ) [219 of 628] Compiling Types.DeferredParse ( Types/DeferredParse.hs, dist/build/git-annex/git-annex-tmp/Types/DeferredParse.o ) [220 of 628] Compiling Types ( Types.hs, dist/build/git-annex/git-annex-tmp/Types.o ) [221 of 628] Compiling Types.Transfer ( Types/Transfer.hs, dist/build/git-annex/git-annex-tmp/Types/Transfer.o ) [222 of 628] Compiling Types.ActionItem ( Types/ActionItem.hs, dist/build/git-annex/git-annex-tmp/Types/ActionItem.o ) [223 of 628] Compiling Types.Command ( Types/Command.hs, dist/build/git-annex/git-annex-tmp/Types/Command.o ) [224 of 628] Compiling Types.Test ( Types/Test.hs, dist/build/git-annex/git-annex-tmp/Types/Test.o ) [225 of 628] Compiling Types.Benchmark ( Types/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Types/Benchmark.o ) [226 of 628] Compiling Remote.WebDAV.DavLocation ( Remote/WebDAV/DavLocation.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV/DavLocation.o ) [227 of 628] Compiling Remote.Rsync.RsyncUrl ( Remote/Rsync/RsyncUrl.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync/RsyncUrl.o ) [228 of 628] Compiling Assistant.Types.RepoProblem ( Assistant/Types/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RepoProblem.o ) [229 of 628] Compiling Messages.Concurrent ( Messages/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Messages/Concurrent.o ) [230 of 628] Compiling Messages.Internal ( Messages/Internal.hs, dist/build/git-annex/git-annex-tmp/Messages/Internal.o ) [231 of 628] Compiling Messages ( Messages.hs, dist/build/git-annex/git-annex-tmp/Messages.o ) [232 of 628] Compiling Messages.Progress ( Messages/Progress.hs, dist/build/git-annex/git-annex-tmp/Messages/Progress.o ) [233 of 628] Compiling CmdLine.GlobalSetter ( CmdLine/GlobalSetter.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GlobalSetter.o ) [234 of 628] Compiling Annex.LockPool.PosixOrPid ( Annex/LockPool/PosixOrPid.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool/PosixOrPid.o ) [235 of 628] Compiling Annex.LockPool ( Annex/LockPool.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool.o ) [236 of 628] Compiling Annex.Common ( Annex/Common.hs, dist/build/git-annex/git-annex-tmp/Annex/Common.o ) [237 of 628] Compiling Upgrade.V4 ( Upgrade/V4.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V4.o ) [238 of 628] Compiling Upgrade.V3 ( Upgrade/V3.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V3.o ) [239 of 628] Compiling Types.View ( Types/View.hs, dist/build/git-annex/git-annex-tmp/Types/View.o ) [240 of 628] Compiling Types.StoreRetrieve ( Types/StoreRetrieve.hs, dist/build/git-annex/git-annex-tmp/Types/StoreRetrieve.o ) [241 of 628] Compiling Remote.Helper.ReadOnly ( Remote/Helper/ReadOnly.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ReadOnly.o ) [242 of 628] Compiling Remote.Helper.Messages ( Remote/Helper/Messages.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Messages.o ) [243 of 628] Compiling Remote.Helper.Git ( Remote/Helper/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Git.o ) [244 of 628] Compiling Remote.External.Types ( Remote/External/Types.hs, dist/build/git-annex/git-annex-tmp/Remote/External/Types.o ) [245 of 628] Compiling Logs.Trust.Pure ( Logs/Trust/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Pure.o ) [246 of 628] Compiling Logs.Transitions ( Logs/Transitions.hs, dist/build/git-annex/git-annex-tmp/Logs/Transitions.o ) [247 of 628] Compiling Logs.SingleValue.Pure ( Logs/SingleValue/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue/Pure.o ) [248 of 628] Compiling Logs.MetaData.Pure ( Logs/MetaData/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData/Pure.o ) [249 of 628] Compiling Logs.Remote.Pure ( Logs/Remote/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote/Pure.o ) [250 of 628] Compiling Logs.Presence.Pure ( Logs/Presence/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence/Pure.o ) [251 of 628] Compiling Logs.Difference.Pure ( Logs/Difference/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference/Pure.o ) [252 of 628] Compiling Logs.ContentIdentifier.Pure ( Logs/ContentIdentifier/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier/Pure.o ) [253 of 628] Compiling Logs.Chunk.Pure ( Logs/Chunk/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk/Pure.o ) [254 of 628] Compiling Logs ( Logs.hs, dist/build/git-annex/git-annex-tmp/Logs.o ) [255 of 628] Compiling Annex.Branch.Transitions ( Annex/Branch/Transitions.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch/Transitions.o ) [256 of 628] Compiling Crypto ( Crypto.hs, dist/build/git-annex/git-annex-tmp/Crypto.o ) [257 of 628] Compiling Config ( Config.hs, dist/build/git-annex/git-annex-tmp/Config.o ) [258 of 628] Compiling Remote.Helper.Encryptable ( Remote/Helper/Encryptable.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Encryptable.o ) [259 of 628] Compiling Config.Smudge ( Config/Smudge.hs, dist/build/git-annex/git-annex-tmp/Config/Smudge.o ) [260 of 628] Compiling CmdLine.Usage ( CmdLine/Usage.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Usage.o ) [261 of 628] Compiling CmdLine.Option ( CmdLine/Option.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Option.o ) [262 of 628] Compiling CmdLine.GitAnnexShell.Fields ( CmdLine/GitAnnexShell/Fields.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Fields.o ) [263 of 628] Compiling Backend.Utilities ( Backend/Utilities.hs, dist/build/git-annex/git-annex-tmp/Backend/Utilities.o ) [264 of 628] Compiling Backend.WORM ( Backend/WORM.hs, dist/build/git-annex/git-annex-tmp/Backend/WORM.o ) [265 of 628] Compiling Backend.URL ( Backend/URL.hs, dist/build/git-annex/git-annex-tmp/Backend/URL.o ) [266 of 628] Compiling Backend.Hash ( Backend/Hash.hs, dist/build/git-annex/git-annex-tmp/Backend/Hash.o ) [267 of 628] Compiling Assistant.Types.TransferQueue ( Assistant/Types/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferQueue.o ) [268 of 628] Compiling Assistant.Types.ThreadedMonad ( Assistant/Types/ThreadedMonad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadedMonad.o ) [269 of 628] Compiling Assistant.Types.ScanRemotes ( Assistant/Types/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ScanRemotes.o ) [270 of 628] Compiling Assistant.Types.Pushes ( Assistant/Types/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Pushes.o ) [271 of 628] Compiling Assistant.Ssh ( Assistant/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/Ssh.o ) [272 of 628] Compiling Assistant.Alert.Utility ( Assistant/Alert/Utility.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert/Utility.o ) [273 of 628] Compiling Annex.View.ViewedFile ( Annex/View/ViewedFile.hs, dist/build/git-annex/git-annex-tmp/Annex/View/ViewedFile.o ) [274 of 628] Compiling Annex.Version ( Annex/Version.hs, dist/build/git-annex/git-annex-tmp/Annex/Version.o ) [275 of 628] Compiling Annex.VariantFile ( Annex/VariantFile.hs, dist/build/git-annex/git-annex-tmp/Annex/VariantFile.o ) [276 of 628] Compiling Annex.Url ( Annex/Url.hs, dist/build/git-annex/git-annex-tmp/Annex/Url.o ) [277 of 628] Compiling Annex.UUID ( Annex/UUID.hs, dist/build/git-annex/git-annex-tmp/Annex/UUID.o ) [278 of 628] Compiling Annex.Perms ( Annex/Perms.hs, dist/build/git-annex/git-annex-tmp/Annex/Perms.o ) [279 of 628] Compiling Database.Init ( Database/Init.hs, dist/build/git-annex/git-annex-tmp/Database/Init.o ) [280 of 628] Compiling Creds ( Creds.hs, dist/build/git-annex/git-annex-tmp/Creds.o ) [281 of 628] Compiling Remote.Helper.AWS ( Remote/Helper/AWS.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/AWS.o ) [282 of 628] Compiling P2P.Address ( P2P/Address.hs, dist/build/git-annex/git-annex-tmp/P2P/Address.o ) [283 of 628] Compiling P2P.Auth ( P2P/Auth.hs, dist/build/git-annex/git-annex-tmp/P2P/Auth.o ) [284 of 628] Compiling Annex.Notification ( Annex/Notification.hs, dist/build/git-annex/git-annex-tmp/Annex/Notification.o ) [285 of 628] Compiling Annex.LockFile ( Annex/LockFile.hs, dist/build/git-annex/git-annex-tmp/Annex/LockFile.o ) [286 of 628] Compiling Remote.Helper.Hooks ( Remote/Helper/Hooks.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Hooks.o ) [287 of 628] Compiling Database.Fsck ( Database/Fsck.hs, dist/build/git-annex/git-annex-tmp/Database/Fsck.o ) [288 of 628] Compiling Annex.Tmp ( Annex/Tmp.hs, dist/build/git-annex/git-annex-tmp/Annex/Tmp.o ) [289 of 628] Compiling Annex.ReplaceFile ( Annex/ReplaceFile.hs, dist/build/git-annex/git-annex-tmp/Annex/ReplaceFile.o ) [290 of 628] Compiling Logs.File ( Logs/File.hs, dist/build/git-annex/git-annex-tmp/Logs/File.o ) [291 of 628] Compiling Logs.View ( Logs/View.hs, dist/build/git-annex/git-annex-tmp/Logs/View.o ) [292 of 628] Compiling Logs.Unused ( Logs/Unused.hs, dist/build/git-annex/git-annex-tmp/Logs/Unused.o ) [293 of 628] Compiling Logs.Transfer ( Logs/Transfer.hs, dist/build/git-annex/git-annex-tmp/Logs/Transfer.o ) [294 of 628] Compiling Logs.Smudge ( Logs/Smudge.hs, dist/build/git-annex/git-annex-tmp/Logs/Smudge.o ) [295 of 628] Compiling Logs.FsckResults ( Logs/FsckResults.hs, dist/build/git-annex/git-annex-tmp/Logs/FsckResults.o ) [296 of 628] Compiling Annex.Ssh ( Annex/Ssh.hs, dist/build/git-annex/git-annex-tmp/Annex/Ssh.o ) [297 of 628] Compiling Annex.Queue ( Annex/Queue.hs, dist/build/git-annex/git-annex-tmp/Annex/Queue.o ) [298 of 628] Compiling Annex.Journal ( Annex/Journal.hs, dist/build/git-annex/git-annex-tmp/Annex/Journal.o ) [299 of 628] Compiling Annex.InodeSentinal ( Annex/InodeSentinal.hs, dist/build/git-annex/git-annex-tmp/Annex/InodeSentinal.o ) [300 of 628] Compiling Upgrade.V5.Direct ( Upgrade/V5/Direct.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5/Direct.o ) [301 of 628] Compiling Annex.Hook ( Annex/Hook.hs, dist/build/git-annex/git-annex-tmp/Annex/Hook.o ) [302 of 628] Compiling Upgrade.V6 ( Upgrade/V6.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V6.o ) [303 of 628] Compiling Annex.HashObject ( Annex/HashObject.hs, dist/build/git-annex/git-annex-tmp/Annex/HashObject.o ) [304 of 628] Compiling Annex.Link ( Annex/Link.hs, dist/build/git-annex/git-annex-tmp/Annex/Link.o ) [305 of 628] Compiling Annex.GitOverlay ( Annex/GitOverlay.hs, dist/build/git-annex/git-annex-tmp/Annex/GitOverlay.o ) [306 of 628] Compiling Annex.CurrentBranch ( Annex/CurrentBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/CurrentBranch.o ) [307 of 628] Compiling Annex.Content.LowLevel ( Annex/Content/LowLevel.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/LowLevel.o ) [308 of 628] Compiling Annex.Content.PointerFile ( Annex/Content/PointerFile.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/PointerFile.o ) [309 of 628] Compiling Annex.ChangedRefs ( Annex/ChangedRefs.hs, dist/build/git-annex/git-annex-tmp/Annex/ChangedRefs.o ) [310 of 628] Compiling RemoteDaemon.Types ( RemoteDaemon/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Types.o ) [311 of 628] Compiling Assistant.Types.RemoteControl ( Assistant/Types/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RemoteControl.o ) [312 of 628] Compiling RemoteDaemon.Transport.Ssh.Types ( RemoteDaemon/Transport/Ssh/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh/Types.o ) [313 of 628] Compiling P2P.Protocol ( P2P/Protocol.hs, dist/build/git-annex/git-annex-tmp/P2P/Protocol.o ) [314 of 628] Compiling P2P.IO ( P2P/IO.hs, dist/build/git-annex/git-annex-tmp/P2P/IO.o ) [315 of 628] Compiling CmdLine.GitRemoteTorAnnex ( CmdLine/GitRemoteTorAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitRemoteTorAnnex.o ) [316 of 628] Compiling Annex.CheckIgnore ( Annex/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckIgnore.o ) [317 of 628] Compiling Annex.CheckAttr ( Annex/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckAttr.o ) [318 of 628] Compiling Backend ( Backend.hs, dist/build/git-annex/git-annex-tmp/Backend.o ) [319 of 628] Compiling Annex.CatFile ( Annex/CatFile.hs, dist/build/git-annex/git-annex-tmp/Annex/CatFile.o ) [320 of 628] Compiling RemoteDaemon.Common ( RemoteDaemon/Common.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Common.o ) [321 of 628] Compiling Database.Keys ( Database/Keys.hs, dist/build/git-annex/git-annex-tmp/Database/Keys.o ) [322 of 628] Compiling Annex.RemoteTrackingBranch ( Annex/RemoteTrackingBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/RemoteTrackingBranch.o ) [323 of 628] Compiling Annex.Export ( Annex/Export.hs, dist/build/git-annex/git-annex-tmp/Annex/Export.o ) [324 of 628] Compiling Annex.Concurrent ( Annex/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Annex/Concurrent.o ) [325 of 628] Compiling Annex.Transfer ( Annex/Transfer.hs, dist/build/git-annex/git-annex-tmp/Annex/Transfer.o ) [326 of 628] Compiling Annex.BranchState ( Annex/BranchState.hs, dist/build/git-annex/git-annex-tmp/Annex/BranchState.o ) [327 of 628] Compiling Annex.Branch ( Annex/Branch.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch.o ) [328 of 628] Compiling Logs.UUID ( Logs/UUID.hs, dist/build/git-annex/git-annex-tmp/Logs/UUID.o ) [329 of 628] Compiling Logs.Trust.Basic ( Logs/Trust/Basic.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Basic.o ) [330 of 628] Compiling Logs.SingleValue ( Logs/SingleValue.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue.o ) [331 of 628] Compiling Logs.NumCopies ( Logs/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Logs/NumCopies.o ) [332 of 628] Compiling Logs.Schedule ( Logs/Schedule.hs, dist/build/git-annex/git-annex-tmp/Logs/Schedule.o ) [333 of 628] Compiling Logs.RemoteState ( Logs/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Logs/RemoteState.o ) [334 of 628] Compiling Logs.Remote ( Logs/Remote.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote.o ) [335 of 628] Compiling Logs.Presence ( Logs/Presence.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence.o ) [336 of 628] Compiling Logs.PreferredContent.Raw ( Logs/PreferredContent/Raw.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent/Raw.o ) [337 of 628] Compiling Logs.Multicast ( Logs/Multicast.hs, dist/build/git-annex/git-annex-tmp/Logs/Multicast.o ) [338 of 628] Compiling Logs.MetaData ( Logs/MetaData.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData.o ) [339 of 628] Compiling Annex.MetaData ( Annex/MetaData.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData.o ) [340 of 628] Compiling Logs.Location ( Logs/Location.hs, dist/build/git-annex/git-annex-tmp/Logs/Location.o ) [341 of 628] Compiling Logs.Web ( Logs/Web.hs, dist/build/git-annex/git-annex-tmp/Logs/Web.o ) [342 of 628] Compiling Logs.Group ( Logs/Group.hs, dist/build/git-annex/git-annex-tmp/Logs/Group.o ) [343 of 628] Compiling Logs.Export ( Logs/Export.hs, dist/build/git-annex/git-annex-tmp/Logs/Export.o ) [344 of 628] Compiling Database.Export ( Database/Export.hs, dist/build/git-annex/git-annex-tmp/Database/Export.o ) [345 of 628] Compiling Logs.Difference ( Logs/Difference.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference.o ) [346 of 628] Compiling Annex.Difference ( Annex/Difference.hs, dist/build/git-annex/git-annex-tmp/Annex/Difference.o ) [347 of 628] Compiling Logs.ContentIdentifier ( Logs/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Logs/ContentIdentifier.o ) [348 of 628] Compiling Logs.Config ( Logs/Config.hs, dist/build/git-annex/git-annex-tmp/Logs/Config.o ) [349 of 628] Compiling Config.GitConfig ( Config/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Config/GitConfig.o ) [350 of 628] Compiling Logs.Chunk ( Logs/Chunk.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk.o ) [351 of 628] Compiling Remote.Helper.Chunked ( Remote/Helper/Chunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked.o ) [352 of 628] Compiling Remote.Helper.Chunked.Legacy ( Remote/Helper/Chunked/Legacy.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked/Legacy.o ) [353 of 628] Compiling Logs.Activity ( Logs/Activity.hs, dist/build/git-annex/git-annex-tmp/Logs/Activity.o ) [354 of 628] Compiling Database.ContentIdentifier ( Database/ContentIdentifier.hs, dist/build/git-annex/git-annex-tmp/Database/ContentIdentifier.o ) [355 of 628] Compiling Remote.Helper.ExportImport ( Remote/Helper/ExportImport.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ExportImport.o ) [356 of 628] Compiling Remote.BitTorrent ( Remote/BitTorrent.hs, dist/build/git-annex/git-annex-tmp/Remote/BitTorrent.o ) [357 of 628] Compiling Annex.Content ( Annex/Content.hs, dist/build/git-annex/git-annex-tmp/Annex/Content.o ) [358 of 628] Compiling Upgrade.V2 ( Upgrade/V2.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V2.o ) [359 of 628] Compiling Upgrade.V1 ( Upgrade/V1.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V1.o ) [360 of 628] Compiling Upgrade.V0 ( Upgrade/V0.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V0.o ) [361 of 628] Compiling Remote.Helper.Special ( Remote/Helper/Special.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Special.o ) [362 of 628] Compiling Remote.Tahoe ( Remote/Tahoe.hs, dist/build/git-annex/git-annex-tmp/Remote/Tahoe.o ) [363 of 628] Compiling Remote.Rsync ( Remote/Rsync.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync.o ) [364 of 628] Compiling Remote.Hook ( Remote/Hook.hs, dist/build/git-annex/git-annex-tmp/Remote/Hook.o ) [365 of 628] Compiling Remote.Helper.Http ( Remote/Helper/Http.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Http.o ) [366 of 628] Compiling Remote.WebDAV ( Remote/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV.o ) [367 of 628] Compiling Remote.S3 ( Remote/S3.hs, dist/build/git-annex/git-annex-tmp/Remote/S3.o ) [368 of 628] Compiling Remote.Glacier ( Remote/Glacier.hs, dist/build/git-annex/git-annex-tmp/Remote/Glacier.o ) [369 of 628] Compiling Remote.Directory.LegacyChunked ( Remote/Directory/LegacyChunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory/LegacyChunked.o ) [370 of 628] Compiling Remote.Ddar ( Remote/Ddar.hs, dist/build/git-annex/git-annex-tmp/Remote/Ddar.o ) [371 of 628] Compiling Remote.Adb ( Remote/Adb.hs, dist/build/git-annex/git-annex-tmp/Remote/Adb.o ) [372 of 628] Compiling Remote.Helper.P2P ( Remote/Helper/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/P2P.o ) [373 of 628] Compiling Remote.External ( Remote/External.hs, dist/build/git-annex/git-annex-tmp/Remote/External.o ) [374 of 628] Compiling Remote.Directory ( Remote/Directory.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory.o ) [375 of 628] Compiling P2P.Annex ( P2P/Annex.hs, dist/build/git-annex/git-annex-tmp/P2P/Annex.o ) [376 of 628] Compiling RemoteDaemon.Transport.Tor ( RemoteDaemon/Transport/Tor.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Tor.o ) [377 of 628] Compiling Remote.P2P ( Remote/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/P2P.o ) [378 of 628] Compiling Remote.Helper.Ssh ( Remote/Helper/Ssh.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Ssh.o ) [379 of 628] Compiling RemoteDaemon.Transport.Ssh ( RemoteDaemon/Transport/Ssh.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh.o ) [380 of 628] Compiling Remote.GCrypt ( Remote/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Remote/GCrypt.o ) [381 of 628] Compiling RemoteDaemon.Transport.GCrypt ( RemoteDaemon/Transport/GCrypt.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/GCrypt.o ) [382 of 628] Compiling RemoteDaemon.Transport ( RemoteDaemon/Transport.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport.o ) [383 of 628] Compiling RemoteDaemon.Core ( RemoteDaemon/Core.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Core.o ) [384 of 628] Compiling Remote.GitLFS ( Remote/GitLFS.hs, dist/build/git-annex/git-annex-tmp/Remote/GitLFS.o ) [385 of 628] Compiling Remote.Bup ( Remote/Bup.hs, dist/build/git-annex/git-annex-tmp/Remote/Bup.o ) [386 of 628] Compiling Annex.YoutubeDl ( Annex/YoutubeDl.hs, dist/build/git-annex/git-annex-tmp/Annex/YoutubeDl.o ) [387 of 628] Compiling Remote.Web ( Remote/Web.hs, dist/build/git-annex/git-annex-tmp/Remote/Web.o ) [388 of 628] Compiling Annex.WorkTree ( Annex/WorkTree.hs, dist/build/git-annex/git-annex-tmp/Annex/WorkTree.o ) [389 of 628] Compiling Annex.AutoMerge ( Annex/AutoMerge.hs, dist/build/git-annex/git-annex-tmp/Annex/AutoMerge.o ) [390 of 628] Compiling Annex.BloomFilter ( Annex/BloomFilter.hs, dist/build/git-annex/git-annex-tmp/Annex/BloomFilter.o ) [391 of 628] Compiling Annex.AdjustedBranch ( Annex/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch.o ) [392 of 628] Compiling Upgrade.V5 ( Upgrade/V5.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5.o ) [393 of 628] Compiling Upgrade ( Upgrade.hs, dist/build/git-annex/git-annex-tmp/Upgrade.o ) [394 of 628] Compiling Annex.UpdateInstead ( Annex/UpdateInstead.hs, dist/build/git-annex/git-annex-tmp/Annex/UpdateInstead.o ) [395 of 628] Compiling Annex.Ingest ( Annex/Ingest.hs, dist/build/git-annex/git-annex-tmp/Annex/Ingest.o ) [396 of 628] Compiling Assistant.Types.Changes ( Assistant/Types/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Changes.o ) [397 of 628] Compiling Annex.Action ( Annex/Action.hs, dist/build/git-annex/git-annex-tmp/Annex/Action.o ) [398 of 628] Compiling Assistant.Gpg ( Assistant/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/Gpg.o ) [399 of 628] Compiling Annex.Environment ( Annex/Environment.hs, dist/build/git-annex/git-annex-tmp/Annex/Environment.o ) [400 of 628] Compiling Annex.Init ( Annex/Init.hs, dist/build/git-annex/git-annex-tmp/Annex/Init.o ) [401 of 628] Compiling Remote.Git ( Remote/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Git.o ) [402 of 628] Compiling Remote.List ( Remote/List.hs, dist/build/git-annex/git-annex-tmp/Remote/List.o ) [403 of 628] Compiling Logs.Trust ( Logs/Trust.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust.o ) [404 of 628] Compiling Remote ( Remote.hs, dist/build/git-annex/git-annex-tmp/Remote.o ) [405 of 628] Compiling Assistant.WebApp.RepoId ( Assistant/WebApp/RepoId.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoId.o ) [406 of 628] Compiling Annex.TaggedPush ( Annex/TaggedPush.hs, dist/build/git-annex/git-annex-tmp/Annex/TaggedPush.o ) [407 of 628] Compiling Annex.NumCopies ( Annex/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Annex/NumCopies.o ) [408 of 628] Compiling Limit ( Limit.hs, dist/build/git-annex/git-annex-tmp/Limit.o ) [409 of 628] Compiling Annex.FileMatcher ( Annex/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Annex/FileMatcher.o ) [410 of 628] Compiling Logs.PreferredContent ( Logs/PreferredContent.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent.o ) [411 of 628] Compiling Annex.Wanted ( Annex/Wanted.hs, dist/build/git-annex/git-annex-tmp/Annex/Wanted.o ) [412 of 628] Compiling Limit.Wanted ( Limit/Wanted.hs, dist/build/git-annex/git-annex-tmp/Limit/Wanted.o ) [413 of 628] Compiling CmdLine.GitAnnex.Options ( CmdLine/GitAnnex/Options.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex/Options.o ) [414 of 628] Compiling CmdLine.Seek ( CmdLine/Seek.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Seek.o ) [415 of 628] Compiling CmdLine.Action ( CmdLine/Action.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Action.o ) [416 of 628] Compiling CmdLine.Batch ( CmdLine/Batch.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Batch.o ) [417 of 628] Compiling Annex.View ( Annex/View.hs, dist/build/git-annex/git-annex-tmp/Annex/View.o ) [418 of 628] Compiling Annex.SpecialRemote ( Annex/SpecialRemote.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote.o ) [419 of 628] Compiling Command ( Command.hs, dist/build/git-annex/git-annex-tmp/Command.o ) [420 of 628] Compiling Command.Whereis ( Command/Whereis.hs, dist/build/git-annex/git-annex-tmp/Command/Whereis.o ) [421 of 628] Compiling Command.Wanted ( Command/Wanted.hs, dist/build/git-annex/git-annex-tmp/Command/Wanted.o ) [422 of 628] Compiling Command.View ( Command/View.hs, dist/build/git-annex/git-annex-tmp/Command/View.o ) [423 of 628] Compiling Command.Vicfg ( Command/Vicfg.hs, dist/build/git-annex/git-annex-tmp/Command/Vicfg.o ) [424 of 628] Compiling Command.Version ( Command/Version.hs, dist/build/git-annex/git-annex-tmp/Command/Version.o ) [425 of 628] Compiling Command.VPop ( Command/VPop.hs, dist/build/git-annex/git-annex-tmp/Command/VPop.o ) [426 of 628] Compiling Command.VFilter ( Command/VFilter.hs, dist/build/git-annex/git-annex-tmp/Command/VFilter.o ) [427 of 628] Compiling Command.VCycle ( Command/VCycle.hs, dist/build/git-annex/git-annex-tmp/Command/VCycle.o ) [428 of 628] Compiling Command.VAdd ( Command/VAdd.hs, dist/build/git-annex/git-annex-tmp/Command/VAdd.o ) [429 of 628] Compiling Command.Upgrade ( Command/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Command/Upgrade.o ) [430 of 628] Compiling Command.Unused ( Command/Unused.hs, dist/build/git-annex/git-annex-tmp/Command/Unused.o ) [431 of 628] Compiling Command.Unlock ( Command/Unlock.hs, dist/build/git-annex/git-annex-tmp/Command/Unlock.o ) [432 of 628] Compiling Command.Ungroup ( Command/Ungroup.hs, dist/build/git-annex/git-annex-tmp/Command/Ungroup.o ) [433 of 628] Compiling Command.Unannex ( Command/Unannex.hs, dist/build/git-annex/git-annex-tmp/Command/Unannex.o ) [434 of 628] Compiling Command.Uninit ( Command/Uninit.hs, dist/build/git-annex/git-annex-tmp/Command/Uninit.o ) [435 of 628] Compiling Test.Framework ( Test/Framework.hs, dist/build/git-annex/git-annex-tmp/Test/Framework.o ) [436 of 628] Compiling Command.Trust ( Command/Trust.hs, dist/build/git-annex/git-annex-tmp/Command/Trust.o ) [437 of 628] Compiling Command.Untrust ( Command/Untrust.hs, dist/build/git-annex/git-annex-tmp/Command/Untrust.o ) [438 of 628] Compiling Command.TransferKeys ( Command/TransferKeys.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKeys.o ) [439 of 628] Compiling Command.TransferKey ( Command/TransferKey.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKey.o ) [440 of 628] Compiling Command.TransferInfo ( Command/TransferInfo.hs, dist/build/git-annex/git-annex-tmp/Command/TransferInfo.o ) [441 of 628] Compiling Command.TestRemote ( Command/TestRemote.hs, dist/build/git-annex/git-annex-tmp/Command/TestRemote.o ) [442 of 628] Compiling Command.Test ( Command/Test.hs, dist/build/git-annex/git-annex-tmp/Command/Test.o ) [443 of 628] Compiling Command.Status ( Command/Status.hs, dist/build/git-annex/git-annex-tmp/Command/Status.o ) [444 of 628] Compiling Command.Smudge ( Command/Smudge.hs, dist/build/git-annex/git-annex-tmp/Command/Smudge.o ) [445 of 628] Compiling Command.SetPresentKey ( Command/SetPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetPresentKey.o ) [446 of 628] Compiling Command.SetKey ( Command/SetKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetKey.o ) [447 of 628] Compiling Command.SendKey ( Command/SendKey.hs, dist/build/git-annex/git-annex-tmp/Command/SendKey.o ) [448 of 628] Compiling Command.Semitrust ( Command/Semitrust.hs, dist/build/git-annex/git-annex-tmp/Command/Semitrust.o ) [449 of 628] Compiling Command.Schedule ( Command/Schedule.hs, dist/build/git-annex/git-annex-tmp/Command/Schedule.o ) [450 of 628] Compiling Command.RmUrl ( Command/RmUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RmUrl.o ) [451 of 628] Compiling Command.ResolveMerge ( Command/ResolveMerge.hs, dist/build/git-annex/git-annex-tmp/Command/ResolveMerge.o ) [452 of 628] Compiling Command.Required ( Command/Required.hs, dist/build/git-annex/git-annex-tmp/Command/Required.o ) [453 of 628] Compiling Command.Repair ( Command/Repair.hs, dist/build/git-annex/git-annex-tmp/Command/Repair.o ) [454 of 628] Compiling Command.RenameRemote ( Command/RenameRemote.hs, dist/build/git-annex/git-annex-tmp/Command/RenameRemote.o ) [455 of 628] Compiling Command.RemoteDaemon ( Command/RemoteDaemon.hs, dist/build/git-annex/git-annex-tmp/Command/RemoteDaemon.o ) [456 of 628] Compiling Command.Reinject ( Command/Reinject.hs, dist/build/git-annex/git-annex-tmp/Command/Reinject.o ) [457 of 628] Compiling Command.Reinit ( Command/Reinit.hs, dist/build/git-annex/git-annex-tmp/Command/Reinit.o ) [458 of 628] Compiling Command.RecvKey ( Command/RecvKey.hs, dist/build/git-annex/git-annex-tmp/Command/RecvKey.o ) [459 of 628] Compiling Command.ReadPresentKey ( Command/ReadPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReadPresentKey.o ) [460 of 628] Compiling Command.ReKey ( Command/ReKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReKey.o ) [461 of 628] Compiling Command.Proxy ( Command/Proxy.hs, dist/build/git-annex/git-annex-tmp/Command/Proxy.o ) [462 of 628] Compiling Command.P2P ( Command/P2P.hs, dist/build/git-annex/git-annex-tmp/Command/P2P.o ) [463 of 628] Compiling Command.NumCopies ( Command/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Command/NumCopies.o ) [464 of 628] Compiling Command.NotifyChanges ( Command/NotifyChanges.hs, dist/build/git-annex/git-annex-tmp/Command/NotifyChanges.o ) [465 of 628] Compiling Command.Multicast ( Command/Multicast.hs, dist/build/git-annex/git-annex-tmp/Command/Multicast.o ) [466 of 628] Compiling Command.MetaData ( Command/MetaData.hs, dist/build/git-annex/git-annex-tmp/Command/MetaData.o ) [467 of 628] Compiling Command.MatchExpression ( Command/MatchExpression.hs, dist/build/git-annex/git-annex-tmp/Command/MatchExpression.o ) [468 of 628] Compiling Command.Map ( Command/Map.hs, dist/build/git-annex/git-annex-tmp/Command/Map.o ) [469 of 628] Compiling Command.LookupKey ( Command/LookupKey.hs, dist/build/git-annex/git-annex-tmp/Command/LookupKey.o ) [470 of 628] Compiling Command.Log ( Command/Log.hs, dist/build/git-annex/git-annex-tmp/Command/Log.o ) [471 of 628] Compiling Command.LockContent ( Command/LockContent.hs, dist/build/git-annex/git-annex-tmp/Command/LockContent.o ) [472 of 628] Compiling Command.Lock ( Command/Lock.hs, dist/build/git-annex/git-annex-tmp/Command/Lock.o ) [473 of 628] Compiling Command.List ( Command/List.hs, dist/build/git-annex/git-annex-tmp/Command/List.o ) [474 of 628] Compiling Command.Inprogress ( Command/Inprogress.hs, dist/build/git-annex/git-annex-tmp/Command/Inprogress.o ) [475 of 628] Compiling Command.InitRemote ( Command/InitRemote.hs, dist/build/git-annex/git-annex-tmp/Command/InitRemote.o ) [476 of 628] Compiling Command.Init ( Command/Init.hs, dist/build/git-annex/git-annex-tmp/Command/Init.o ) [477 of 628] Compiling Command.Info ( Command/Info.hs, dist/build/git-annex/git-annex-tmp/Command/Info.o ) [478 of 628] Compiling Command.Indirect ( Command/Indirect.hs, dist/build/git-annex/git-annex-tmp/Command/Indirect.o ) [479 of 628] Compiling Command.InAnnex ( Command/InAnnex.hs, dist/build/git-annex/git-annex-tmp/Command/InAnnex.o ) [480 of 628] Compiling Command.GroupWanted ( Command/GroupWanted.hs, dist/build/git-annex/git-annex-tmp/Command/GroupWanted.o ) [481 of 628] Compiling Command.Group ( Command/Group.hs, dist/build/git-annex/git-annex-tmp/Command/Group.o ) [482 of 628] Compiling Command.GCryptSetup ( Command/GCryptSetup.hs, dist/build/git-annex/git-annex-tmp/Command/GCryptSetup.o ) [483 of 628] Compiling Command.FuzzTest ( Command/FuzzTest.hs, dist/build/git-annex/git-annex-tmp/Command/FuzzTest.o ) [484 of 628] Compiling Command.Fsck ( Command/Fsck.hs, dist/build/git-annex/git-annex-tmp/Command/Fsck.o ) [485 of 628] Compiling Command.Migrate ( Command/Migrate.hs, dist/build/git-annex/git-annex-tmp/Command/Migrate.o ) [486 of 628] Compiling Command.FromKey ( Command/FromKey.hs, dist/build/git-annex/git-annex-tmp/Command/FromKey.o ) [487 of 628] Compiling Command.RegisterUrl ( Command/RegisterUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RegisterUrl.o ) [488 of 628] Compiling Command.Forget ( Command/Forget.hs, dist/build/git-annex/git-annex-tmp/Command/Forget.o ) [489 of 628] Compiling Command.Fix ( Command/Fix.hs, dist/build/git-annex/git-annex-tmp/Command/Fix.o ) [490 of 628] Compiling Command.PreCommit ( Command/PreCommit.hs, dist/build/git-annex/git-annex-tmp/Command/PreCommit.o ) [491 of 628] Compiling Command.Find ( Command/Find.hs, dist/build/git-annex/git-annex-tmp/Command/Find.o ) [492 of 628] Compiling Command.FindRef ( Command/FindRef.hs, dist/build/git-annex/git-annex-tmp/Command/FindRef.o ) [493 of 628] Compiling Command.Export ( Command/Export.hs, dist/build/git-annex/git-annex-tmp/Command/Export.o ) [494 of 628] Compiling Command.Expire ( Command/Expire.hs, dist/build/git-annex/git-annex-tmp/Command/Expire.o ) [495 of 628] Compiling Command.ExamineKey ( Command/ExamineKey.hs, dist/build/git-annex/git-annex-tmp/Command/ExamineKey.o ) [496 of 628] Compiling Command.EnableTor ( Command/EnableTor.hs, dist/build/git-annex/git-annex-tmp/Command/EnableTor.o ) [497 of 628] Compiling Command.EnableRemote ( Command/EnableRemote.hs, dist/build/git-annex/git-annex-tmp/Command/EnableRemote.o ) [498 of 628] Compiling Command.DropKey ( Command/DropKey.hs, dist/build/git-annex/git-annex-tmp/Command/DropKey.o ) [499 of 628] Compiling Command.Drop ( Command/Drop.hs, dist/build/git-annex/git-annex-tmp/Command/Drop.o ) [500 of 628] Compiling Command.Move ( Command/Move.hs, dist/build/git-annex/git-annex-tmp/Command/Move.o ) [501 of 628] Compiling Command.Get ( Command/Get.hs, dist/build/git-annex/git-annex-tmp/Command/Get.o ) [502 of 628] Compiling Command.Mirror ( Command/Mirror.hs, dist/build/git-annex/git-annex-tmp/Command/Mirror.o ) [503 of 628] Compiling Command.DropUnused ( Command/DropUnused.hs, dist/build/git-annex/git-annex-tmp/Command/DropUnused.o ) [504 of 628] Compiling Command.Direct ( Command/Direct.hs, dist/build/git-annex/git-annex-tmp/Command/Direct.o ) [505 of 628] Compiling Command.DiffDriver ( Command/DiffDriver.hs, dist/build/git-annex/git-annex-tmp/Command/DiffDriver.o ) [506 of 628] Compiling Command.Describe ( Command/Describe.hs, dist/build/git-annex/git-annex-tmp/Command/Describe.o ) [507 of 628] Compiling Command.Dead ( Command/Dead.hs, dist/build/git-annex/git-annex-tmp/Command/Dead.o ) [508 of 628] Compiling Command.Copy ( Command/Copy.hs, dist/build/git-annex/git-annex-tmp/Command/Copy.o ) [509 of 628] Compiling Command.ContentLocation ( Command/ContentLocation.hs, dist/build/git-annex/git-annex-tmp/Command/ContentLocation.o ) [510 of 628] Compiling Command.Config ( Command/Config.hs, dist/build/git-annex/git-annex-tmp/Command/Config.o ) [511 of 628] Compiling Command.Commit ( Command/Commit.hs, dist/build/git-annex/git-annex-tmp/Command/Commit.o ) [512 of 628] Compiling Command.CheckPresentKey ( Command/CheckPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/CheckPresentKey.o ) [513 of 628] Compiling Command.CalcKey ( Command/CalcKey.hs, dist/build/git-annex/git-annex-tmp/Command/CalcKey.o ) [514 of 628] Compiling Command.Benchmark ( Command/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Command/Benchmark.o ) [515 of 628] Compiling Command.Adjust ( Command/Adjust.hs, dist/build/git-annex/git-annex-tmp/Command/Adjust.o ) [516 of 628] Compiling Command.AddUnused ( Command/AddUnused.hs, dist/build/git-annex/git-annex-tmp/Command/AddUnused.o ) [517 of 628] Compiling Command.Add ( Command/Add.hs, dist/build/git-annex/git-annex-tmp/Command/Add.o ) [518 of 628] Compiling Command.AddUrl ( Command/AddUrl.hs, dist/build/git-annex/git-annex-tmp/Command/AddUrl.o ) [519 of 628] Compiling Command.ImportFeed ( Command/ImportFeed.hs, dist/build/git-annex/git-annex-tmp/Command/ImportFeed.o ) [520 of 628] Compiling CmdLine ( CmdLine.hs, dist/build/git-annex/git-annex-tmp/CmdLine.o ) [521 of 628] Compiling Benchmark ( Benchmark.hs, dist/build/git-annex/git-annex-tmp/Benchmark.o ) [522 of 628] Compiling Annex.Import ( Annex/Import.hs, dist/build/git-annex/git-annex-tmp/Annex/Import.o ) [523 of 628] Compiling Command.Import ( Command/Import.hs, dist/build/git-annex/git-annex-tmp/Command/Import.o ) [524 of 628] Compiling Annex.Drop ( Annex/Drop.hs, dist/build/git-annex/git-annex-tmp/Annex/Drop.o ) [525 of 628] Compiling Command.Sync ( Command/Sync.hs, dist/build/git-annex/git-annex-tmp/Command/Sync.o ) [526 of 628] Compiling Command.Undo ( Command/Undo.hs, dist/build/git-annex/git-annex-tmp/Command/Undo.o ) [527 of 628] Compiling Command.PostReceive ( Command/PostReceive.hs, dist/build/git-annex/git-annex-tmp/Command/PostReceive.o ) [528 of 628] Compiling Command.Merge ( Command/Merge.hs, dist/build/git-annex/git-annex-tmp/Command/Merge.o ) [529 of 628] Compiling Command.Help ( Command/Help.hs, dist/build/git-annex/git-annex-tmp/Command/Help.o ) [530 of 628] Compiling CmdLine.GitAnnexShell.Checks ( CmdLine/GitAnnexShell/Checks.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Checks.o ) [531 of 628] Compiling Command.P2PStdIO ( Command/P2PStdIO.hs, dist/build/git-annex/git-annex-tmp/Command/P2PStdIO.o ) [532 of 628] Compiling Command.ConfigList ( Command/ConfigList.hs, dist/build/git-annex/git-annex-tmp/Command/ConfigList.o ) [533 of 628] Compiling CmdLine.GitAnnexShell ( CmdLine/GitAnnexShell.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell.o ) [534 of 628] Compiling Utility.Verifiable ( Utility/Verifiable.hs, dist/build/git-annex/git-annex-tmp/Utility/Verifiable.o ) [535 of 628] Compiling Test ( Test.hs, dist/build/git-annex/git-annex-tmp/Test.o ) [536 of 628] Compiling Assistant.Pairing ( Assistant/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing.o ) [537 of 628] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o ) [538 of 628] Compiling Assistant.Types.TransferrerPool ( Assistant/Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferrerPool.o ) [539 of 628] Compiling Assistant.Monad ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o ) [540 of 628] Compiling Assistant.Types.NamedThread ( Assistant/Types/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/NamedThread.o ) [541 of 628] Compiling Assistant.Common ( Assistant/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/Common.o ) [542 of 628] Compiling Assistant.WebApp.Pairing ( Assistant/WebApp/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Pairing.o ) [543 of 628] Compiling Assistant.Unused ( Assistant/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/Unused.o ) [544 of 628] Compiling Assistant.TransferrerPool ( Assistant/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferrerPool.o ) [545 of 628] Compiling Assistant.ScanRemotes ( Assistant/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/ScanRemotes.o ) [546 of 628] Compiling Assistant.RepoProblem ( Assistant/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/RepoProblem.o ) [547 of 628] Compiling Assistant.RemoteControl ( Assistant/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/RemoteControl.o ) [548 of 628] Compiling Assistant.Pushes ( Assistant/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pushes.o ) [549 of 628] Compiling Assistant.MakeRemote ( Assistant/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRemote.o ) [550 of 628] Compiling Assistant.Install ( Assistant/Install.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install.o ) [551 of 628] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/DaemonStatus.o ) [552 of 628] Compiling Assistant.TransferQueue ( Assistant/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferQueue.o ) [553 of 628] Compiling Assistant.Threads.Glacier ( Assistant/Threads/Glacier.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Glacier.o ) [554 of 628] Compiling Assistant.Threads.DaemonStatus ( Assistant/Threads/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/DaemonStatus.o ) [555 of 628] Compiling Assistant.Drop ( Assistant/Drop.hs, dist/build/git-annex/git-annex-tmp/Assistant/Drop.o ) [556 of 628] Compiling Assistant.CredPairCache ( Assistant/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/CredPairCache.o ) [557 of 628] Compiling Assistant.Commits ( Assistant/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Commits.o ) [558 of 628] Compiling Assistant.Threads.Exporter ( Assistant/Threads/Exporter.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Exporter.o ) [559 of 628] Compiling Assistant.Changes ( Assistant/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Changes.o ) [560 of 628] Compiling Assistant.BranchChange ( Assistant/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/BranchChange.o ) [561 of 628] Compiling Assistant.Threads.ConfigMonitor ( Assistant/Threads/ConfigMonitor.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ConfigMonitor.o ) [562 of 628] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o ) [563 of 628] Compiling Utility.WebApp ( Utility/WebApp.hs, dist/build/git-annex/git-annex-tmp/Utility/WebApp.o ) [564 of 628] Compiling Utility.Yesod ( Utility/Yesod.hs, dist/build/git-annex/git-annex-tmp/Utility/Yesod.o ) [565 of 628] Compiling Assistant.WebApp.Types ( Assistant/WebApp/Types.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Types.o ) [566 of 628] Compiling Assistant.WebApp.Form ( Assistant/WebApp/Form.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Form.o ) [567 of 628] Compiling Assistant.WebApp ( Assistant/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp.o ) [568 of 628] Compiling Assistant.WebApp.Notifications ( Assistant/WebApp/Notifications.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Notifications.o ) [569 of 628] Compiling Assistant.WebApp.SideBar ( Assistant/WebApp/SideBar.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/SideBar.o ) [570 of 628] Compiling Assistant.WebApp.Page ( Assistant/WebApp/Page.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Page.o ) [571 of 628] Compiling Assistant.WebApp.Common ( Assistant/WebApp/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Common.o ) [572 of 628] Compiling Assistant.WebApp.Documentation ( Assistant/WebApp/Documentation.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Documentation.o ) [573 of 628] Compiling Assistant.WebApp.Configurators.Unused ( Assistant/WebApp/Configurators/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Unused.o ) [574 of 628] Compiling Assistant.WebApp.Configurators.Preferences ( Assistant/WebApp/Configurators/Preferences.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Preferences.o ) [575 of 628] Compiling Assistant.MakeRepo ( Assistant/MakeRepo.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRepo.o ) [576 of 628] Compiling Assistant.Types.UrlRenderer ( Assistant/Types/UrlRenderer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/UrlRenderer.o ) [577 of 628] Compiling Assistant.Alert ( Assistant/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert.o ) [578 of 628] Compiling Assistant.TransferSlots ( Assistant/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferSlots.o ) [579 of 628] Compiling Assistant.Threads.Transferrer ( Assistant/Threads/Transferrer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Transferrer.o ) [580 of 628] Compiling Assistant.Threads.TransferWatcher ( Assistant/Threads/TransferWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferWatcher.o ) [581 of 628] Compiling Assistant.Threads.TransferPoller ( Assistant/Threads/TransferPoller.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferPoller.o ) [582 of 628] Compiling Assistant.Threads.Watcher ( Assistant/Threads/Watcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Watcher.o ) [583 of 628] Compiling Assistant.Threads.RemoteControl ( Assistant/Threads/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/RemoteControl.o ) [584 of 628] Compiling Assistant.Threads.Committer ( Assistant/Threads/Committer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Committer.o ) [585 of 628] Compiling Assistant.NamedThread ( Assistant/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/NamedThread.o ) [586 of 628] Compiling Assistant.Sync ( Assistant/Sync.hs, dist/build/git-annex/git-annex-tmp/Assistant/Sync.o ) [587 of 628] Compiling Assistant.WebApp.RepoList ( Assistant/WebApp/RepoList.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoList.o ) [588 of 628] Compiling Assistant.WebApp.DashBoard ( Assistant/WebApp/DashBoard.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/DashBoard.o ) [589 of 628] Compiling Assistant.WebApp.Configurators ( Assistant/WebApp/Configurators.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators.o ) [590 of 628] Compiling Assistant.WebApp.MakeRemote ( Assistant/WebApp/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/MakeRemote.o ) [591 of 628] Compiling Assistant.WebApp.Gpg ( Assistant/WebApp/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Gpg.o ) [592 of 628] Compiling Assistant.WebApp.Configurators.WebDAV ( Assistant/WebApp/Configurators/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/WebDAV.o ) [593 of 628] Compiling Assistant.WebApp.Configurators.Ssh ( Assistant/WebApp/Configurators/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Ssh.o ) [594 of 628] Compiling Assistant.WebApp.Configurators.AWS ( Assistant/WebApp/Configurators/AWS.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/AWS.o ) [595 of 628] Compiling Assistant.WebApp.Configurators.IA ( Assistant/WebApp/Configurators/IA.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/IA.o ) [596 of 628] Compiling Assistant.WebApp.Configurators.Edit ( Assistant/WebApp/Configurators/Edit.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Edit.o ) [597 of 628] Compiling Assistant.Threads.Pusher ( Assistant/Threads/Pusher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Pusher.o ) [598 of 628] Compiling Assistant.Threads.NetWatcher ( Assistant/Threads/NetWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/NetWatcher.o ) [599 of 628] Compiling Assistant.Threads.Merger ( Assistant/Threads/Merger.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Merger.o ) [600 of 628] Compiling Assistant.Repair ( Assistant/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/Repair.o ) [601 of 628] Compiling Assistant.WebApp.Repair ( Assistant/WebApp/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Repair.o ) [602 of 628] Compiling Assistant.Threads.ProblemFixer ( Assistant/Threads/ProblemFixer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ProblemFixer.o ) [603 of 628] Compiling Assistant.Pairing.MakeRemote ( Assistant/Pairing/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/MakeRemote.o ) [604 of 628] Compiling Assistant.WebApp.Configurators.Pairing ( Assistant/WebApp/Configurators/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Pairing.o ) [605 of 628] Compiling Assistant.Threads.PairListener ( Assistant/Threads/PairListener.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/PairListener.o ) [606 of 628] Compiling Assistant.Restart ( Assistant/Restart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Restart.o ) [607 of 628] Compiling Assistant.WebApp.OtherRepos ( Assistant/WebApp/OtherRepos.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/OtherRepos.o ) [608 of 628] Compiling Assistant.WebApp.Control ( Assistant/WebApp/Control.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Control.o ) [609 of 628] Compiling Assistant.WebApp.Configurators.Local ( Assistant/WebApp/Configurators/Local.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Local.o ) [610 of 628] Compiling Assistant.Upgrade ( Assistant/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/Upgrade.o ) [611 of 628] Compiling Assistant.WebApp.Configurators.Upgrade ( Assistant/WebApp/Configurators/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Upgrade.o ) [612 of 628] Compiling Assistant.Threads.Upgrader ( Assistant/Threads/Upgrader.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Upgrader.o ) [613 of 628] Compiling Assistant.Threads.UpgradeWatcher ( Assistant/Threads/UpgradeWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/UpgradeWatcher.o ) [614 of 628] Compiling Assistant.Threads.SanityChecker ( Assistant/Threads/SanityChecker.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/SanityChecker.o ) [615 of 628] Compiling Assistant.Fsck ( Assistant/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/Fsck.o ) [616 of 628] Compiling Assistant.WebApp.Configurators.Fsck ( Assistant/WebApp/Configurators/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Fsck.o ) [617 of 628] Compiling Assistant.Threads.MountWatcher ( Assistant/Threads/MountWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/MountWatcher.o ) [618 of 628] Compiling Assistant.Threads.Cronner ( Assistant/Threads/Cronner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Cronner.o ) [619 of 628] Compiling Assistant.DeleteRemote ( Assistant/DeleteRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/DeleteRemote.o ) [620 of 628] Compiling Assistant.WebApp.Configurators.Delete ( Assistant/WebApp/Configurators/Delete.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Delete.o ) [621 of 628] Compiling Assistant.Threads.WebApp ( Assistant/Threads/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/WebApp.o ) [622 of 628] Compiling Assistant.Threads.TransferScanner ( Assistant/Threads/TransferScanner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferScanner.o ) [623 of 628] Compiling Assistant ( Assistant.hs, dist/build/git-annex/git-annex-tmp/Assistant.o ) [624 of 628] Compiling Command.WebApp ( Command/WebApp.hs, dist/build/git-annex/git-annex-tmp/Command/WebApp.o ) [625 of 628] Compiling Command.Watch ( Command/Watch.hs, dist/build/git-annex/git-annex-tmp/Command/Watch.o ) [626 of 628] Compiling Command.Assistant ( Command/Assistant.hs, dist/build/git-annex/git-annex-tmp/Command/Assistant.o ) [627 of 628] Compiling CmdLine.GitAnnex ( CmdLine/GitAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex.o ) [628 of 628] Compiling Main ( git-annex.hs, dist/build/git-annex/git-annex-tmp/Main.o ) Linking dist/build/git-annex/git-annex ... + LC_ALL=C + TZ=UTC + ikiwiki doc html -v --wikiname git-annex --plugin=goodstuff --no-usedirs --disable-plugin=openid --plugin=sidebar --underlaydir=/dev/null --set deterministic=1 --disable-plugin=shortcut --disable-plugin=smiley --plugin=comments --set 'comments_pagespec=*' '--exclude=news/.*' '--exclude=design/assistant/blog/*' '--exclude=bugs/*' '--exclude=todo/*' '--exclude=forum/*' '--exclude=users/*' '--exclude=devblog/*' --exclude=thanks refreshing wiki.. scanning git-annex-preferred-content.mdwn scanning git-annex-vpop.mdwn scanning git-annex-assistant.mdwn scanning git-annex-view.mdwn scanning git-annex-pre-commit.mdwn scanning git-annex-repair.mdwn scanning git-annex-reinit.mdwn scanning git-annex-calckey.mdwn scanning git-annex-unannex.mdwn scanning git-remote-tor-annex.mdwn scanning git-annex-map.mdwn scanning git-annex-watch.mdwn scanning index.mdwn scanning git-annex-fsck.mdwn scanning git-annex-shell.mdwn scanning git-annex-enableremote.mdwn scanning git-annex-vfilter.mdwn scanning git-annex-indirect.mdwn scanning git-annex-get.mdwn scanning git-annex-p2p.mdwn scanning git-annex-init.mdwn scanning git-annex-test.mdwn scanning git-annex-status.mdwn scanning git-annex-initremote.mdwn scanning git-annex-rmurl.mdwn scanning git-annex-import.mdwn scanning git-annex-metadata.mdwn scanning git-annex-proxy.mdwn scanning git-annex-diffdriver.mdwn scanning git-annex-resolvemerge.mdwn scanning git-annex-ungroup.mdwn scanning git-annex-move.mdwn scanning git-annex-export.mdwn scanning logo.svg scanning git-annex-info.mdwn scanning git-annex-forget.mdwn scanning git-annex-matchexpression.mdwn scanning git-annex-adjust.mdwn scanning git-annex-uninit.mdwn scanning git-annex-transferkey.mdwn scanning git-annex-upgrade.mdwn scanning git-annex-sync.mdwn scanning git-annex-required.mdwn scanning git-annex-mirror.mdwn scanning git-annex-vicfg.mdwn scanning git-annex-find.mdwn scanning git-annex-enable-tor.mdwn scanning git-annex-copy.mdwn scanning git-annex-transferkeys.mdwn scanning git-annex-multicast.mdwn scanning git-annex-setkey.mdwn scanning git-annex-trust.mdwn scanning git-annex-readpresentkey.mdwn scanning git-annex-vcycle.mdwn scanning git-annex-migrate.mdwn scanning git-annex-edit.mdwn scanning git-annex-numcopies.mdwn scanning logo_16x16.png scanning git-annex-dead.mdwn scanning git-annex-smudge.mdwn scanning git-annex-testremote.mdwn scanning git-annex-matching-options.mdwn scanning git-annex-untrust.mdwn scanning git-annex-list.mdwn scanning git-annex-semitrust.mdwn scanning git-annex.mdwn scanning git-annex-version.mdwn scanning git-annex-unlock.mdwn scanning git-annex-schedule.mdwn scanning git-annex-unused.mdwn scanning git-annex-rekey.mdwn scanning git-annex-reinject.mdwn scanning git-annex-addurl.mdwn scanning git-annex-checkpresentkey.mdwn scanning git-annex-whereis.mdwn scanning git-annex-direct.mdwn scanning git-annex-dropkey.mdwn scanning git-annex-add.mdwn scanning git-annex-log.mdwn scanning git-annex-webapp.mdwn scanning git-annex-importfeed.mdwn scanning git-annex-remotedaemon.mdwn scanning git-annex-findref.mdwn scanning git-annex-examinekey.mdwn scanning git-annex-groupwanted.mdwn scanning git-annex-describe.mdwn scanning git-annex-wanted.mdwn scanning git-annex-fromkey.mdwn scanning git-annex-inprogress.mdwn scanning git-annex-merge.mdwn scanning git-annex-vadd.mdwn scanning git-annex-dropunused.mdwn scanning git-annex-fuzztest.mdwn scanning git-annex-undo.mdwn scanning git-annex-group.mdwn scanning git-annex-renameremote.mdwn scanning git-annex-fix.mdwn scanning git-annex-addunused.mdwn scanning git-annex-registerurl.mdwn scanning git-annex-expire.mdwn scanning git-annex-drop.mdwn scanning git-annex-lookupkey.mdwn scanning git-annex-contentlocation.mdwn scanning git-annex-lock.mdwn scanning git-annex-setpresentkey.mdwn scanning license/GPL scanning license/AGPL scanning ikiwiki/relativedate.js scanning ikiwiki/toggle.js scanning ikiwiki/ikiwiki.js building git-annex-preferred-content.mdwn building git-annex-vpop.mdwn building git-annex-assistant.mdwn building git-annex-view.mdwn building git-annex-pre-commit.mdwn building git-annex-repair.mdwn building git-annex-reinit.mdwn building git-annex-calckey.mdwn building git-annex-unannex.mdwn building git-remote-tor-annex.mdwn building git-annex-map.mdwn building git-annex-watch.mdwn building index.mdwn building git-annex-fsck.mdwn building git-annex-shell.mdwn building git-annex-enableremote.mdwn building git-annex-vfilter.mdwn building git-annex-indirect.mdwn building git-annex-get.mdwn building git-annex-p2p.mdwn building git-annex-init.mdwn building git-annex-test.mdwn building git-annex-status.mdwn building git-annex-initremote.mdwn building git-annex-rmurl.mdwn building git-annex-import.mdwn building git-annex-metadata.mdwn building git-annex-proxy.mdwn building git-annex-diffdriver.mdwn building git-annex-resolvemerge.mdwn building git-annex-ungroup.mdwn building git-annex-move.mdwn building git-annex-export.mdwn building logo.svg building git-annex-info.mdwn building git-annex-forget.mdwn building git-annex-matchexpression.mdwn building git-annex-adjust.mdwn building git-annex-uninit.mdwn building git-annex-transferkey.mdwn building git-annex-upgrade.mdwn building git-annex-sync.mdwn building git-annex-required.mdwn building git-annex-mirror.mdwn building git-annex-vicfg.mdwn building git-annex-find.mdwn building git-annex-enable-tor.mdwn building git-annex-copy.mdwn building git-annex-transferkeys.mdwn building git-annex-multicast.mdwn building git-annex-setkey.mdwn building git-annex-trust.mdwn building git-annex-readpresentkey.mdwn building git-annex-vcycle.mdwn building git-annex-migrate.mdwn building git-annex-edit.mdwn building git-annex-numcopies.mdwn building logo_16x16.png building git-annex-dead.mdwn building git-annex-smudge.mdwn building git-annex-testremote.mdwn building git-annex-matching-options.mdwn building git-annex-untrust.mdwn building git-annex-list.mdwn building git-annex-semitrust.mdwn building git-annex.mdwn building git-annex-version.mdwn building git-annex-unlock.mdwn building git-annex-schedule.mdwn building git-annex-unused.mdwn building git-annex-rekey.mdwn building git-annex-reinject.mdwn building git-annex-addurl.mdwn building git-annex-checkpresentkey.mdwn building git-annex-whereis.mdwn building git-annex-direct.mdwn building git-annex-dropkey.mdwn building git-annex-add.mdwn building git-annex-log.mdwn building git-annex-webapp.mdwn building git-annex-importfeed.mdwn building git-annex-remotedaemon.mdwn building git-annex-findref.mdwn building git-annex-examinekey.mdwn building git-annex-groupwanted.mdwn building git-annex-describe.mdwn building git-annex-wanted.mdwn building git-annex-fromkey.mdwn building git-annex-inprogress.mdwn building git-annex-merge.mdwn building git-annex-vadd.mdwn building git-annex-dropunused.mdwn building git-annex-fuzztest.mdwn building git-annex-undo.mdwn building git-annex-group.mdwn building git-annex-renameremote.mdwn building git-annex-fix.mdwn building git-annex-addunused.mdwn building git-annex-registerurl.mdwn building git-annex-expire.mdwn building git-annex-drop.mdwn building git-annex-lookupkey.mdwn building git-annex-contentlocation.mdwn building git-annex-lock.mdwn building git-annex-setpresentkey.mdwn building license/GPL building license/AGPL building ikiwiki/relativedate.js building ikiwiki/toggle.js building ikiwiki/ikiwiki.js done Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.X49Zkb + exit 0 + umask 022 + cd /builddir/build/BUILD + '[' /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm '!=' / ']' + rm -rf /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm ++ dirname /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm + mkdir -p /builddir/build/BUILDROOT + mkdir /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm + cd git-annex-7.20191024 + '[' -x Setup ']' + LANG=C.utf8 + ./Setup copy --destdir=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm Installing executable git-annex in /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/bin Warning: Executable installed in /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/bin ++ pkg-config --variable=completionsdir bash-completion + bash_completion_dir=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/bash-completion/completions + mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/bash-completion/completions + install -m 644 bash-completion.bash /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/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.Ls2DdU + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + mkdir test + pushd test ~/build/BUILD/git-annex-7.20191024/test ~/build/BUILD/git-annex-7.20191024 + PATH=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin + git annex test Tests QuickCheck prop_encode_decode_roundtrip: OK (0.25s) +++ OK, passed 1000 tests. prop_encode_c_decode_c_roundtrip: OK (0.21s) +++ OK, passed 1000 tests. prop_isomorphic_key_encode: OK (0.21s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape: OK (0.13s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape_multiword: OK (4.77s) +++ OK, passed 1000 tests. prop_isomorphic_configEscape: OK (0.13s) +++ OK, passed 1000 tests. prop_parse_show_Config: OK (0.26s) +++ OK, passed 1000 tests. prop_upFrom_basics: OK (0.10s) +++ OK, passed 1000 tests. prop_relPathDirToFile_basics: OK (0.20s) +++ 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.41s) +++ OK, passed 1000 tests. prop_segment_regressionTest: OK +++ OK, passed 1 tests. prop_read_write_transferinfo: OK (0.18s) +++ OK, passed 1000 tests. prop_read_show_inodecache: OK (0.08s) +++ OK, passed 1000 tests. prop_parse_build_presence_log: OK (7.93s) +++ OK, passed 1000 tests. prop_parse_build_contentidentifier_log: OK (8.33s) +++ 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 (5.38s) +++ OK, passed 1000 tests. prop_metadata_serialize: OK (5.80s) +++ OK, passed 1000 tests. prop_branchView_legal: OK (3.96s) +++ OK, passed 1000 tests. prop_viewPath_roundtrips: OK (0.26s) +++ OK, passed 1000 tests. prop_view_roundtrips: OK (3.16s) +++ OK, passed 1000 tests. prop_viewedFile_rountrips: OK (0.11s) +++ OK, passed 1000 tests. prop_b64_roundtrips: OK (0.03s) +++ OK, passed 1000 tests. prop_standardGroups_parse: OK +++ OK, passed 1 tests. Init Tests Unit Tests v7 adjusted unlocked branch init: add dup: init test repo (scanning for unlocked files...) ok (recording state in git...) [master (root-commit) c9b17e3] empty adjust Switched to branch 'adjusted/master(unlocked)' ok OK (0.48s) add: add foo 100% 20 B 4 KiB/s 0s ok (recording state in git...) add sha1foo 100% 25 B 33 KiB/s 0s ok (recording state in git...) OK (1.03s) All 2 tests passed (1.51s) [adjusted/master(unlocked) 6f5d3b5] empty adjust ok add foodup 100% 20 B 4 KiB/s 0s ok (recording state in git...) OK (1.88s) add extras: [adjusted/master(unlocked) a5b8b71] empty adjust ok add apple ok (recording state in git...) OK (1.61s) export_import: [adjusted/master(unlocked) d8af7c3] empty adjust ok initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit On branch adjusted/master(unlocked) Your branch is ahead of 'origin/adjusted/master(unlocked)' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean ok export foo bar.c ok export foo foo ok export foo sha1foo ok (recording state in git...) list foo ok import foo import 100% 16 B 25 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master (Merging into master...) Updating 9c0de3d..826e00e Fast-forward bar.c | 2 +- import | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 bar.c create mode 120000 import (Merging into adjusted branch...) Updating 2b1cf08..144dc15 Fast-forward bar.c | 2 +- import | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 import ok add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) f8414a8] git-annex in .t/tmprepo2 1 file changed, 1 insertion(+), 1 deletion(-) ok unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 3805386] git-annex in .t/tmprepo2 1 file changed, 1 insertion(+), 1 deletion(-) ok unsafe to overwrite file git-annex: export: 2 failed list foo ok import foo import 100% 23 B 41 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) CONFLICT (content): Merge conflict in import Automatic merge failed; fix conflicts and then commit the result. add import 100% 23 B 4 KiB/s 0s ok add import 100% 23 B 33 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) aa017ba] git-annex in .t/tmprepo2 ok unable to propigate merge commit Ref "2625f8e9aa73cb04c8743535b3e361fbdafbf164" back to Ref "refs/heads/master" unexport foo import ok export foo import ok (recording state in git...) OK (6.43s) export_import_subdir: [adjusted/master(unlocked) 60c1871] empty adjust ok initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) [adjusted/master(unlocked) a31328b] moved 1 file changed, 0 insertions(+), 0 deletions(-) rename foo => subdir/foo (100%) commit On branch adjusted/master(unlocked) Your branch is ahead of 'origin/adjusted/master(unlocked)' by 2 commits. (use "git push" to publish your local commits) nothing to commit, working tree clean ok list foo ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 5abefe4..2c912a8 Fast-forward ok export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok merge foo/master ok (recording state in git...) list foo ok update refs/remotes/foo/master ok merge foo/master (Merging into master...) Updating 9bba244..8ac76d4 Fast-forward (Merging into adjusted branch...) Updating edf819f..fb9b6b4 Fast-forward ok (recording state in git...) OK (4.60s) shared clone: [adjusted/master(unlocked) 3021917] empty adjust ok OK (0.81s) log: [adjusted/master(unlocked) a708e3e] empty adjust ok + Sat, 26 Oct 2019 06:50:47 UTC foo | 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] OK (0.88s) import: [adjusted/master(unlocked) 1cead60] empty adjust ok import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) Could not verify that the content is still present in the annex; not removing from the import location. git-annex: import: 1 failed OK (2.24s) reinject: [adjusted/master(unlocked) 8540d88] empty adjust ok reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (1.42s) unannex (no copy): [adjusted/master(unlocked) 7a13100] empty adjust ok OK (1.02s) unannex (with copy): [adjusted/master(unlocked) 5ae6cee] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok OK (1.39s) drop (no remote): [adjusted/master(unlocked) e823e46] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed drop foo ok (recording state in git...) OK (2.11s) drop (with remote): [adjusted/master(unlocked) b9c5f41] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) git-annex: drop: 1 failed numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (1.88s) drop (untrusted remote): [adjusted/master(unlocked) 26346d4] empty adjust ok untrust origin ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (1.51s) get: [adjusted/master(unlocked) 272b3f3] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.64s) get (ssh remote): [adjusted/master(unlocked) 34d1694] empty adjust ok get foo (from origin...) 100% 20 B 37 B/s 0s (checksum...) ok (recording state in git...) OK (2.11s) move: [adjusted/master(unlocked) 4599d5b] empty adjust ok move foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) (recording state in git...) ok (recording state in git...) move foo (to origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) (recording state in git...) ok (recording state in git...) OK (2.87s) move (ssh remote): [adjusted/master(unlocked) 6789bef] empty adjust ok move foo (from origin...) 100% 20 B 344 B/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 1 KiB/s 0s ok (recording state in git...) OK (2.58s) copy: [adjusted/master(unlocked) 29c7e26] empty adjust ok copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (checksum...) 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (2.30s) lock: [adjusted/master(unlocked) c6608df] empty adjust ok add newfile 100% 3 B 566 B/s 0s ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo ok (recording state in git...) unlock foo ok (recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust numcopies.) failed (recording state in git...) git-annex: drop: 1 failed OK (2.43s) lock --force: [adjusted/master(unlocked) cb6d2ab] empty adjust ok upgrade ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo (checksum...) ok (recording state in git...) OK (1.50s) edit (no pre-commit): [adjusted/master(unlocked) 184855c] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (1.71s) edit (pre-commit): [adjusted/master(unlocked) 0dc1142] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (2.00s) partial commit: [adjusted/master(unlocked) da13d1e] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) (recording state in git...) OK (1.61s) fix: [adjusted/master(unlocked) dbeefa3] empty adjust ok OK (0.82s) trust: [adjusted/master(unlocked) 938e6be] empty adjust ok trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (1.91s) fsck (basics): [adjusted/master(unlocked) c977ef7] empty adjust ok fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. git-annex: fsck: 2 failed numcopies 1 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (2.69s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.50s) fsck (local untrusted): [adjusted/master(unlocked) 2c1a47c] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) Only these untrusted locations may have copies of foo 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] 62a89f41-b6a4-482c-8adc-05cf628a7d92 -- .t/tmprepo27 [here] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] Back it up to trusted locations with git-annex copy. git-annex: fsck: 2 failed trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (1.82s) fsck (remote untrusted): [adjusted/master(unlocked) 467a466] empty adjust ok numcopies 2 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] git-annex: fsck: 2 failed OK (2.74s) fsck --from remote: [adjusted/master(unlocked) 9af6bec] empty adjust ok fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.98s) migrate: [adjusted/master(unlocked) d117a84] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.78s) migrate (via gitattributes): [adjusted/master(unlocked) 11d1076] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.88s) unused: [adjusted/master(unlocked) bb4b063] empty adjust ok unused . (checking for unused data...) ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking origin/master...) (checking origin/HEAD...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) ok commit [adjusted/master(unlocked) 1a42376] git-annex in .t/tmprepo32 1 file changed, 1 deletion(-) delete mode 100644 foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking origin/master...) (checking origin/HEAD...) (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok commit [adjusted/master(unlocked) f0a4005] git-annex in .t/tmprepo32 1 file changed, 1 deletion(-) delete mode 100644 sha1foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) git-annex: dropunused: 1 failed dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok git-annex: 10 not valid (run git annex unused for list) add unusedfile 100% 13 B 2 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking adjusted/master(unlocked)...) (checking refs/basis/adjusted/master(unlocked)...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 2 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok OK (6.51s) describe: [adjusted/master(unlocked) 32fbbe4] empty adjust ok describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.97s) find: [adjusted/master(unlocked) ce4a3dd] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) add dir/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) OK (2.61s) merge: [adjusted/master(unlocked) e7c166e] empty adjust ok merge git-annex ok OK (0.87s) info: [adjusted/master(unlocked) 60ece09] empty adjust ok bloomfilter capacity too large to represent; falling back to sane value OK (0.78s) version: [adjusted/master(unlocked) 7b1dd3b] empty adjust ok git-annex version: 7.20191024 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 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external operating system: linux arm supported repository versions: 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (0.91s) sync: [adjusted/master(unlocked) f2854ae] empty adjust ok commit On branch adjusted/master(unlocked) Your branch is ahead of 'origin/adjusted/master(unlocked)' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main0 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) wanted . ok (recording state in git...) commit On branch adjusted/master(unlocked) Your branch and 'origin/adjusted/master(unlocked)' have diverged, and have 5 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main0 764f85a..7324fd9 git-annex -> synced/git-annex ok drop foo ok (recording state in git...) commit On branch adjusted/master(unlocked) Your branch and 'origin/adjusted/master(unlocked)' have diverged, and have 5 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main0 7324fd9..99c3d5d git-annex -> synced/git-annex ok OK (3.93s) union merge regression: [adjusted/master(unlocked) 48668af] empty adjust ok [adjusted/master(unlocked) 48668af] empty adjust ok [adjusted/master(unlocked) 56f51b6] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo40 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master (Merging into master...) Already up to date! Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 56f51b6..9e199b5 Fast-forward ok pull r1 From ../../.t/tmprepo39 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo40 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok push r1 To ../../.t/tmprepo39 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Already up to date! Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 48668af..a6ff9bd Fast-forward ok pull r3 From ../../.t/tmprepo41 * [new branch] adjusted/master(unlocked) -> r3/adjusted/master(unlocked) * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r1 From ../../.t/tmprepo39 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/git-annex -> r1/synced/git-annex * [new branch] synced/master -> r1/synced/master ok push r3 To ../../.t/tmprepo41 ced9fac..1d65808 master -> synced/master * [new branch] git-annex -> synced/git-annex ok push r1 To ../../.t/tmprepo39 ced9fac..1d65808 master -> synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 866b1cb..1d65808 Fast-forward (Merging into adjusted branch...) Updating 48668af..a6ff9bd Fast-forward ok pull r3 From ../../.t/tmprepo41 * [new branch] adjusted/master(unlocked) -> r3/adjusted/master(unlocked) * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/git-annex -> r3/synced/git-annex * [new branch] synced/master -> r3/synced/master ok pull r2 From ../../.t/tmprepo40 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/git-annex -> r2/synced/git-annex * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo41 c1c8143..7a0e8dd git-annex -> r3/git-annex ok pull r2 From ../../.t/tmprepo40 c1c8143..82d811a git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 To ../../.t/tmprepo41 c1c8143..4445f9e git-annex -> synced/git-annex ok push r2 To ../../.t/tmprepo40 c1c8143..4445f9e git-annex -> synced/git-annex ok OK (10.72s) adjusted branch merge regression: [adjusted/master(unlocked) 94f6860] empty adjust ok [adjusted/master(unlocked) 6f08069] empty adjust ok upgrade ok adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 24d92ac] git-annex in .t/tmprepo42 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 From ../../.t/tmprepo43 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master (Merging into master...) Already up to date! Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 24d92ac..580a6d4 Fast-forward ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo43 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok upgrade ok adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) ecb1ebc] git-annex in .t/tmprepo43 1 file changed, 1 insertion(+) create mode 100644 conflictor ok merge synced/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating ecb1ebc..c9a5a73 Fast-forward ok pull r1 From ../../.t/tmprepo42 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo42 6f36e15..8199855 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 6f36e15..8199855 Fast-forward (Merging into adjusted branch...) Updating 5aa6479..02780ba Fast-forward ok pull r2 From ../../.t/tmprepo43 + 6f08069...4148fe4 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) 1f58586..c570de6 git-annex -> r2/git-annex 6f36e15..8199855 master -> r2/master 6f36e15..8199855 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo42 + 5aa6479...4148fe4 adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (6.87s) adjusted branch subtree regression: [adjusted/master(unlocked) 2e1e7b1] empty adjust ok upgrade ok adjust ok add a/b/c/d 100% 3 B 573 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) e5672da] git-annex in .t/tmprepo44 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y 100% 3 B 576 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 4ab0b07] git-annex in .t/tmprepo44 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok Switched to branch 'master' OK (2.31s) conflict resolution: [adjusted/master(unlocked) f358873] empty adjust ok [adjusted/master(unlocked) f358873] empty adjust ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 251d4c6] git-annex in .t/tmprepo45 1 file changed, 1 insertion(+) create mode 100644 conflictor ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 5f02e15] git-annex in .t/tmprepo46 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo46 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD cc8e5f9] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating 8db5eac..bec8fb9 Fast-forward conflictor.variant-75dc | 1 + conflictor => conflictor.variant-a507 | 0 2 files changed, 1 insertion(+) create mode 100644 conflictor.variant-75dc rename conflictor => conflictor.variant-a507 (100%) ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo46 1a63fe7..cc8e5f9 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 1a63fe7..cc8e5f9 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 f10edf5..fab325f Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo45 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo46 + f10edf5...df290c1 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (7.07s) conflict resolution (adjusted branch): [adjusted/master(unlocked) 717e740] empty adjust ok [adjusted/master(unlocked) 717e740] empty adjust ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) d2ec321] git-annex in .t/tmprepo47 1 file changed, 1 insertion(+) create mode 100644 conflictor ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) b5e3ad1] git-annex in .t/tmprepo48 1 file changed, 1 insertion(+) create mode 100644 conflictor ok adjust ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo48 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 4a13829] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating a9cf042..177f884 Fast-forward conflictor.variant-75dc | 1 + conflictor => conflictor.variant-a507 | 0 2 files changed, 1 insertion(+) create mode 100644 conflictor.variant-75dc rename conflictor => conflictor.variant-a507 (100%) ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo48 4cee1d1..4a13829 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 4cee1d1..4a13829 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 a59315e..eb298e3 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo47 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo48 + a59315e...d00044b adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (6.55s) conflict resolution movein regression: [adjusted/master(unlocked) 6f29a80] empty adjust ok [adjusted/master(unlocked) b9f5c0b] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit (recording state in git...) [adjusted/master(unlocked) 266e21c] git-annex in .t/tmprepo49 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 From ../../.t/tmprepo50 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master (Merging into master...) Already up to date! Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 266e21c..32da6d1 Fast-forward ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo50 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit (recording state in git...) [adjusted/master(unlocked) dc5e1bf] git-annex in .t/tmprepo50 1 file changed, 1 insertion(+), 1 deletion(-) ok merge synced/master (Merging into master...) Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 50c2418] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating dc5e1bf..0220f59 Fast-forward foo.variant-0b0e | 1 + foo => foo.variant-bc25 | 0 2 files changed, 1 insertion(+) create mode 100644 foo.variant-0b0e rename foo => foo.variant-bc25 (100%) ok pull r1 From ../../.t/tmprepo49 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo49 caa77cf..50c2418 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating caa77cf..50c2418 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 120000 foo.variant-bc25 (Merging into adjusted branch...) Updating 3d8f6d5..23f2cff Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 ok pull r2 From ../../.t/tmprepo50 + b9f5c0b...480cbe3 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) 72b2a59..f91e11f git-annex -> r2/git-annex caa77cf..50c2418 master -> r2/master caa77cf..50c2418 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (7.72s) conflict resolution (mixed directory and file): [adjusted/master(unlocked) 1b71268] empty adjust ok [adjusted/master(unlocked) cbb6a23] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 62c4035] git-annex in .t/tmprepo51 1 file changed, 1 insertion(+) create mode 100644 conflictor ok add conflictor/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 2f8defb] git-annex in .t/tmprepo52 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo52 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 80dc490] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating f7e3d22..cd7530f Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 100644 conflictor/subfile ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo52 9db8118..80dc490 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 9db8118..80dc490 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 (Merging into adjusted branch...) Updating 616959e..4ac8f63 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo51 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) [adjusted/master(unlocked) 6624e23] empty adjust ok [adjusted/master(unlocked) bc68394] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 8f698e9] git-annex in .t/tmprepo53 1 file changed, 1 insertion(+) create mode 100644 conflictor ok add conflictor/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 598f53e] git-annex in .t/tmprepo54 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo53 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master (Merging into master...) Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 4148eb0] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating d0cad72..05d67e2 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo53 80cad87..4148eb0 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 80cad87..4148eb0 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 120000 conflictor/subfile (Merging into adjusted branch...) Updating c23cafa..3373ead Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 100644 conflictor/subfile ok pull r2 From ../../.t/tmprepo54 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (12.49s) conflict resolution symlink bit: OK conflict resolution (uncommitted local file): [adjusted/master(unlocked) 1628ec2] empty adjust ok [adjusted/master(unlocked) a4de855] empty adjust ok add conflictor 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 96deaa8] git-annex in .t/tmprepo55 1 file changed, 1 insertion(+) create mode 100644 conflictor ok On branch adjusted/master(unlocked) Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo55 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Merge made by the 'recursive' strategy. conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Updating a4de855..3080892 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Already up to date. Updating a4de855..5337708 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting To ../../.t/tmprepo55 5293284..f86461b master -> synced/master * [new branch] git-annex -> synced/git-annex git-annex: sync: 1 failed [adjusted/master(unlocked) f919ab0] empty adjust ok [adjusted/master(unlocked) 3b16f9e] empty adjust ok add conflictor/file 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 71494f5] git-annex in .t/tmprepo57 1 file changed, 1 insertion(+) create mode 100644 conflictor/file ok On branch adjusted/master(unlocked) Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo57 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Merge made by the 'recursive' strategy. conflictor/file | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor/file Updating 3b16f9e..cca9999 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Already up to date. Updating 3b16f9e..395488d error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting To ../../.t/tmprepo57 21a0405..a205863 master -> synced/master * [new branch] git-annex -> synced/git-annex git-annex: sync: 1 failed OK (8.65s) conflict resolution (removed file): [adjusted/master(unlocked) 92f0ed0] empty adjust ok [adjusted/master(unlocked) 38ebd00] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 4e06055] git-annex in .t/tmprepo59 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo59 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master (Merging into master...) Merge made by the 'recursive' strategy. conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor (Merging into adjusted branch...) Updating 38ebd00..fda3d6b Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo59 9eceb18..d7d7e85 master -> synced/master * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit [adjusted/master(unlocked) bc09bf7] git-annex in .t/tmprepo59 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok merge synced/master (Merging into master...) Already up to date! Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating bc09bf7..f4510ea Fast-forward ok pull r2 From ../../.t/tmprepo60 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 To ../../.t/tmprepo60 d7d7e85..bc4f4c6 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit (recording state in git...) [adjusted/master(unlocked) 609a5ff] git-annex in .t/tmprepo60 1 file changed, 1 insertion(+), 1 deletion(-) ok merge synced/master (Merging into master...) CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 54e5c34] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating 609a5ff..9944469 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 From ../../.t/tmprepo59 + 9f1da21...765e7d1 adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) 6e6918b..b115fe3 git-annex -> r1/git-annex d7d7e85..bc4f4c6 master -> r1/master d7d7e85..bc4f4c6 synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo59 6e6918b..f8b9f1b git-annex -> synced/git-annex bc4f4c6..54e5c34 master -> synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating bc4f4c6..54e5c34 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-0cbf (Merging into adjusted branch...) Updating 765e7d1..db2730c Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 From ../../.t/tmprepo60 + f1af3ce...3601c06 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) b115fe3..f8b9f1b git-annex -> r2/git-annex bc4f4c6..54e5c34 master -> r2/master bc4f4c6..54e5c34 synced/master -> r2/synced/master ok [adjusted/master(unlocked) 147e83c] empty adjust ok [adjusted/master(unlocked) 4152c10] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) c4a574a] git-annex in .t/tmprepo61 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo61 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master (Merging into master...) Merge made by the 'recursive' strategy. conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor (Merging into adjusted branch...) Updating 4152c10..8d43c5d Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo61 d370112..85ed80c master -> synced/master * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit (recording state in git...) [adjusted/master(unlocked) 7f2289e] git-annex in .t/tmprepo62 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 To ../../.t/tmprepo61 2ad88f2..95199e2 git-annex -> synced/git-annex 85ed80c..c1fb9b0 master -> synced/master ok commit [adjusted/master(unlocked) 100a9c0] git-annex in .t/tmprepo61 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok merge synced/master (Merging into master...) CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD dd07369] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating 100a9c0..66b4dd9 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 From ../../.t/tmprepo62 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok push r2 To ../../.t/tmprepo62 c1fb9b0..dd07369 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating c1fb9b0..dd07369 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) (Merging into adjusted branch...) Updating bf2c285..926a50d Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 From ../../.t/tmprepo61 + 00f6bf7...270f755 adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) c1fb9b0..dd07369 master -> r1/master c1fb9b0..dd07369 synced/master -> r1/synced/master ok OK (14.64s) conflict resolution (nonannexed file): [adjusted/master(unlocked) b7da521] empty adjust ok [adjusted/master(unlocked) 7dc796f] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 909fa98] git-annex in .t/tmprepo63 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [adjusted/master(unlocked) a117dc2] git-annex in .t/tmprepo64 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo64 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 3543018] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating dad87d2..bb36492 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo64 896bd94..3543018 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 896bd94..3543018 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 (Merging into adjusted branch...) Updating 0daa1c6..5f8f790 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo63 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok [adjusted/master(unlocked) 3f0599b] empty adjust ok [adjusted/master(unlocked) 82a5558] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) c7f8845] git-annex in .t/tmprepo65 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [adjusted/master(unlocked) 7cb35f0] git-annex in .t/tmprepo66 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo65 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 82ad6e8] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating f2099b4..63d6805 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo65 d51ec3e..82ad6e8 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating d51ec3e..82ad6e8 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 conflictor create mode 120000 conflictor.variant-cc12 (Merging into adjusted branch...) Updating 5c20be0..fe3890d Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo66 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok (recording state in git...) OK (11.94s) conflict resolution (nonannexed symlink): [adjusted/master(unlocked) 7342bdc] empty adjust ok [adjusted/master(unlocked) 7342bdc] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 09d1d51] git-annex in .t/tmprepo67 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [adjusted/master(unlocked) 83f3301] git-annex in .t/tmprepo68 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo68 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD 1ad28d0] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating 96e4f72..0fb5189 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 conflictor create mode 100644 conflictor.variant-cc12 ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo68 7fbaa70..1ad28d0 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 7fbaa70..1ad28d0 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 (Merging into adjusted branch...) Updating c596202..19c3486 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo67 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok [adjusted/master(unlocked) de98a92] empty adjust ok [adjusted/master(unlocked) 96ceec6] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 7560d98] git-annex in .t/tmprepo69 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [adjusted/master(unlocked) b1128d4] git-annex in .t/tmprepo70 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo69 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master (Merging into master...) CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [detached HEAD da1a98a] git-annex automatic merge conflict fix (Merging into adjusted branch...) Updating 146630b..50834f9 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo69 207dae8..da1a98a master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 207dae8..da1a98a Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 (Merging into adjusted branch...) Updating c0b7f5f..630cde5 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 conflictor create mode 100644 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo70 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok OK (10.74s) conflict resolution (mixed locked and unlocked file): [adjusted/master(unlocked) 35d33d2] empty adjust ok [adjusted/master(unlocked) 381a840] empty adjust ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) edb1c84] git-annex in .t/tmprepo71 1 file changed, 1 insertion(+) create mode 100644 conflictor ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) a13a0f0] git-annex in .t/tmprepo72 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo72 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 0ff1eec..eb4fdcb Fast-forward ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo72 9639bef..5a2726e master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 9639bef..5a2726e Fast-forward (Merging into adjusted branch...) Updating d597dda..3070a7d Fast-forward ok pull r1 From ../../.t/tmprepo71 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo72 + d597dda...6b8aed5 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok OK (5.33s) map: [adjusted/master(unlocked) 2940f75] empty adjust ok describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../main0 ok left map in .git/annex/map.dot OK (2.08s) uninit: [adjusted/master(unlocked) 84d8027] empty adjust ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was f035345). OK (1.46s) uninit (in git-annex branch): [adjusted/master(unlocked) 3d75f70] empty adjust ok Switched to branch 'git-annex' git-annex: cannot uninit when the git-annex branch is checked out OK (1.08s) upgrade: [adjusted/master(unlocked) cfdd106] empty adjust ok upgrade ok OK (0.82s) whereis: [adjusted/master(unlocked) c6961a4] empty adjust ok whereis foo (1 copy) 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] ok untrust origin ok (recording state in git...) git-annex: whereis: 1 failed get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) whereis foo (1 copy) be4580cb-d727-48f2-826a-cf34bb199ad0 -- .t/tmprepo77 [here] The following untrusted locations may also have copies: 0e3f07d6-456a-4c93-90a1-d38d4399e63e -- test repo [origin] ok OK (1.63s) hook remote: [adjusted/master(unlocked) 96c1a55] empty adjust ok initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (2.38s) directory remote: [adjusted/master(unlocked) e2de711] empty adjust ok initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (checksum...) 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) copy foo (to foo...) 100% 20 B 11 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 29 KiB/s 0s (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (2.30s) rsync remote: [adjusted/master(unlocked) d5c3464] empty adjust ok initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) copy foo (checking foo...) (to foo...) 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 (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) git-annex: drop: 1 failed OK (3.51s) bup remote: [adjusted/master(unlocked) ca3907c] empty adjust ok OK (1.01s) crypto: [adjusted/master(unlocked) 0803c8f] empty adjust ok [adjusted/master(unlocked) e5a3d85] empty adjust ok [adjusted/master(unlocked) e5a3d85] empty adjust ok OK (2.31s) preferred content: [adjusted/master(unlocked) a5bc858] empty adjust ok wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (4.27s) add subdirs: [adjusted/master(unlocked) c0bf25a] empty adjust ok add dir/foo 100% 24 B 4 KiB/s 0s ok (recording state in git...) add ../dir2/foo 100% 20 B 4 KiB/s 0s ok (recording state in git...) OK (1.71s) addurl: [adjusted/master(unlocked) 4590cba] empty adjust ok Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo87/myurl download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo87/myurl git-annex: addurl: 1 failed addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo87/myurl (to _builddir_build_BUILD_git_annex_7.20191024_test_.t_tmprepo87_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo87/myurl (to addurlurldest) ok (recording state in git...) OK (1.47s) Unit Tests v7 unlocked Init Tests init: add dup: init test repo (scanning for unlocked files...) ok (recording state in git...) OK (0.26s) add: add sha1foo 100% 25 B 37 KiB/s 0s ok (recording state in git...) unlock sha1foo ok (recording state in git...) OK (1.04s) All 2 tests passed (1.30s) 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.74s) add extras: add apple ok (recording state in git...) unlock apple ok (recording state in git...) OK (1.59s) export_import: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok export foo bar.c ok export foo foo ok export foo sha1foo ok (recording state in git...) list foo ok import foo import 100% 16 B 29 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master Updating c6cb21c..8b7df99 Fast-forward bar.c | 2 +- foo | 2 +- import | 1 + sha1foo | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 120000 bar.c mode change 100644 => 120000 foo create mode 120000 import mode change 100644 => 120000 sha1foo ok add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [master 307f20d] git-annex in .t/tmprepo90 1 file changed, 1 insertion(+), 1 deletion(-) ok unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [master bae2700] git-annex in .t/tmprepo90 1 file changed, 1 insertion(+), 1 deletion(-) ok unsafe to overwrite file git-annex: export: 2 failed list foo ok import foo import 100% 23 B 38 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 4 KiB/s 0s ok add import ok add import ok (recording state in git...) commit [master fa35eff] git-annex in .t/tmprepo90 ok unexport foo import ok export foo import ok (recording state in git...) OK (5.14s) export_import_subdir: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) [master dfbaf0c] moved 1 file changed, 0 insertions(+), 0 deletions(-) rename foo => subdir/foo (100%) commit On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean ok list foo ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master Merge made by the 'recursive' strategy. ok export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master Updating 3bca754..2684001 Fast-forward subdir/foo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 120000 subdir/foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok merge foo/master Updating 2684001..a716a40 Fast-forward ok (recording state in git...) OK (4.05s) shared clone: OK (0.61s) log: + Sat, 26 Oct 2019 06:54:22 UTC foo | d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] OK (0.67s) import: import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) Could not verify that the content is still present in the annex; not removing from the import location. git-annex: import: 1 failed OK (1.57s) reinject: reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (1.14s) unannex (no copy): OK (1.63s) unannex (with copy): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok OK (1.65s) drop (no remote): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed drop foo ok (recording state in git...) OK (1.36s) drop (with remote): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) git-annex: drop: 1 failed numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (1.66s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (1.16s) get: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.16s) get (ssh remote): get foo (from origin...) 100% 20 B 405 B/s 0s (checksum...) ok (recording state in git...) OK (1.32s) move: move foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) (recording state in git...) ok (recording state in git...) move foo (to origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) (recording state in git...) ok (recording state in git...) OK (2.31s) move (ssh remote): move foo (from origin...) 100% 20 B 380 B/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 2 KiB/s 0s ok (recording state in git...) OK (2.56s) copy: copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (2.00s) lock: add newfile 100% 3 B 599 B/s 0s ok (recording state in git...) unlock newfile ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo ok (recording state in git...) unlock foo ok (recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust numcopies.) failed (recording state in git...) git-annex: drop: 1 failed OK (2.09s) lock --force: upgrade ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo (checksum...) ok (recording state in git...) OK (1.26s) edit (no pre-commit): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (1.68s) edit (pre-commit): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (1.34s) partial commit: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) (recording state in git...) OK (1.28s) fix: OK (0.49s) 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.64s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. git-annex: fsck: 2 failed numcopies 1 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (2.33s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.46s) fsck (local untrusted): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) Only these untrusted locations may have copies of foo 8a969c7b-c282-405c-b74c-4d720a90d6af -- .t/tmprepo115 [here] d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] Back it up to trusted locations with git-annex copy. git-annex: fsck: 2 failed trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (1.45s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] git-annex: fsck: 2 failed OK (2.32s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.74s) migrate: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.38s) migrate (via gitattributes): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (2.35s) unused: unused . (checking for unused data...) ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) ok commit [master 29804a3] git-annex in .t/tmprepo120 1 file changed, 1 deletion(-) delete mode 100644 foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking origin/HEAD...) (checking master...) ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok commit [master f438db6] git-annex in .t/tmprepo120 1 file changed, 1 deletion(-) delete mode 100644 sha1foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) git-annex: dropunused: 1 failed dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok git-annex: 10 not valid (run git annex unused for list) add unusedfile 100% 13 B 3 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 3 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok OK (4.23s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.76s) find: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) add dir/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) OK (2.03s) merge: merge git-annex ok OK (0.72s) info: bloomfilter capacity too large to represent; falling back to sane value OK (0.72s) version: git-annex version: 7.20191024 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 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external operating system: linux arm supported repository versions: 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (0.63s) sync: commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main1 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) wanted . ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main1 c556656..7165be1 git-annex -> synced/git-annex ok drop foo ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main1 7165be1..88cbb1b git-annex -> synced/git-annex ok OK (3.37s) union merge regression: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo128 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok pull r1 From ../../.t/tmprepo127 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo128 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok push r1 To ../../.t/tmprepo127 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo129 * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r1 From ../../.t/tmprepo127 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/git-annex -> r1/synced/git-annex * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo129 * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r2 From ../../.t/tmprepo128 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/git-annex -> r2/synced/git-annex * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo129 754478c..438271a git-annex -> r3/git-annex ok pull r2 From ../../.t/tmprepo128 754478c..b0bbc9c git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 To ../../.t/tmprepo129 * [new branch] git-annex -> synced/git-annex ok push r2 To ../../.t/tmprepo128 754478c..54f509d git-annex -> synced/git-annex ok OK (7.71s) adjusted branch merge regression: upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) fbb6d3b] git-annex in .t/tmprepo130 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 From ../../.t/tmprepo131 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo131 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) b7c4bb7] git-annex in .t/tmprepo131 1 file changed, 1 insertion(+) create mode 100644 conflictor ok merge synced/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating b7c4bb7..4593eb6 Fast-forward ok pull r1 From ../../.t/tmprepo130 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo130 3886dd1..7ad524b master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 3886dd1..7ad524b Fast-forward (Merging into adjusted branch...) Updating 0759aab..c2849a4 Fast-forward ok pull r2 From ../../.t/tmprepo131 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) 6560205..e6aec1e git-annex -> r2/git-annex c6cb21c..7ad524b master -> r2/master 3886dd1..7ad524b synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo130 + 0759aab...1cc1ceb adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (4.80s) adjusted branch subtree regression: upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add a/b/c/d 100% 3 B 588 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) cd82807] git-annex in .t/tmprepo132 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y 100% 3 B 609 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) deb691a] git-annex in .t/tmprepo132 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok Switched to branch 'master' OK (2.00s) conflict resolution: commit (recording state in git...) [master c6e6be9] git-annex in .t/tmprepo133 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 10c99ae] git-annex in .t/tmprepo134 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo134 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master c42efb3] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo134 10c99ae..c42efb3 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 10c99ae..c42efb3 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo133 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo134 10c99ae..c42efb3 master -> r2/master ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (4.81s) conflict resolution (adjusted branch): commit (recording state in git...) [master 4035882] git-annex in .t/tmprepo135 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master bc6e077] git-annex in .t/tmprepo136 1 file changed, 1 insertion(+) create mode 100644 conflictor ok adjust Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo136 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master d9c59d7] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo136 bc6e077..d9c59d7 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating bc6e077..d9c59d7 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 1898e43..6b7bf45 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo135 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo136 + 1898e43...71240a6 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (5.04s) conflict resolution movein regression: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit (recording state in git...) [master ddc36bf] git-annex in .t/tmprepo137 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 From ../../.t/tmprepo138 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo138 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit (recording state in git...) [master dac4558] git-annex in .t/tmprepo138 1 file changed, 1 insertion(+), 1 deletion(-) ok merge synced/master Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 3c97d10] git-annex automatic merge conflict fix ok pull r1 From ../../.t/tmprepo137 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo137 ddc36bf..3c97d10 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating ddc36bf..3c97d10 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 ok pull r2 From ../../.t/tmprepo138 65708e1..3787a56 git-annex -> r2/git-annex c6cb21c..3c97d10 master -> r2/master ddc36bf..3c97d10 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (5.74s) conflict resolution (mixed directory and file): commit (recording state in git...) [master 8d918f3] git-annex in .t/tmprepo139 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master c466c83] git-annex in .t/tmprepo140 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo140 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 9c435a4] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo140 c466c83..9c435a4 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating c466c83..9c435a4 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo139 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit (recording state in git...) [master 115da99] git-annex in .t/tmprepo141 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master b9152df] git-annex in .t/tmprepo142 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo141 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 7e9c7e2] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo141 115da99..7e9c7e2 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 115da99..7e9c7e2 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 100644 conflictor/subfile ok pull r2 From ../../.t/tmprepo142 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (9.64s) conflict resolution symlink bit: OK conflict resolution (uncommitted local file): commit (recording state in git...) [master 391cf2f] git-annex in .t/tmprepo143 1 file changed, 1 insertion(+) create mode 100644 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo143 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating c6cb21c..391cf2f error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating c6cb21c..391cf2f To ../../.t/tmprepo143 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo143' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. To ../../.t/tmprepo143 ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo143' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. git-annex: sync: 2 failed commit (recording state in git...) [master 0fd5476] git-annex in .t/tmprepo145 1 file changed, 1 insertion(+) create mode 100644 conflictor/file ok On branch master Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo145 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating c6cb21c..0fd5476 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating c6cb21c..0fd5476 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting To ../../.t/tmprepo145 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo145' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. To ../../.t/tmprepo145 ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo145' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. git-annex: sync: 2 failed OK (6.23s) conflict resolution (removed file): commit (recording state in git...) [master 4e22052] git-annex in .t/tmprepo147 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo147 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating c6cb21c..4e22052 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo147 * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit [master 44d5722] git-annex in .t/tmprepo147 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok pull r2 From ../../.t/tmprepo148 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 To ../../.t/tmprepo148 4e22052..44d5722 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit (recording state in git...) [master f650738] git-annex in .t/tmprepo148 1 file changed, 1 insertion(+), 1 deletion(-) ok merge synced/master CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 14ead2c] git-annex automatic merge conflict fix ok pull r1 From ../../.t/tmprepo147 7b8c818..8d55c5d git-annex -> r1/git-annex 4e22052..44d5722 master -> r1/master 4e22052..44d5722 synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo147 7b8c818..eaf5134 git-annex -> synced/git-annex 44d5722..14ead2c master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 44d5722..14ead2c Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 From ../../.t/tmprepo148 8d55c5d..eaf5134 git-annex -> r2/git-annex 4e22052..14ead2c master -> r2/master 44d5722..14ead2c synced/master -> r2/synced/master ok commit (recording state in git...) [master 420af07] git-annex in .t/tmprepo149 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo149 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating c6cb21c..420af07 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo149 * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit (recording state in git...) [master d9f5fcb] git-annex in .t/tmprepo150 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 To ../../.t/tmprepo149 a8df929..6187bf4 git-annex -> synced/git-annex 420af07..d9f5fcb master -> synced/master ok commit [master ad8fe7a] git-annex in .t/tmprepo149 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok merge synced/master CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 0a1eb68] git-annex automatic merge conflict fix ok pull r2 From ../../.t/tmprepo150 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok push r2 To ../../.t/tmprepo150 d9f5fcb..0a1eb68 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating d9f5fcb..0a1eb68 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 From ../../.t/tmprepo149 420af07..0a1eb68 master -> r1/master d9f5fcb..0a1eb68 synced/master -> r1/synced/master ok OK (10.05s) conflict resolution (nonannexed file): commit (recording state in git...) [master 33db182] git-annex in .t/tmprepo151 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 9e57641] git-annex in .t/tmprepo152 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo152 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 2113b00] git-annex automatic merge conflict fix Already up to date. ok push r2 To ../../.t/tmprepo152 9e57641..2113b00 master -> synced/master * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 9e57641..2113b00 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo151 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) commit (recording state in git...) [master 3cea424] git-annex in .t/tmprepo153 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 1329f7f] git-annex in .t/tmprepo154 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo153 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 81a2435] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo153 3cea424..81a2435 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 3cea424..81a2435 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo154 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok (recording state in git...) OK (9.22s) conflict resolution (nonannexed symlink): commit (recording state in git...) [master 9b80c4b] git-annex in .t/tmprepo155 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 3ef5f66] git-annex in .t/tmprepo156 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo156 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 5034a04] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo156 3ef5f66..5034a04 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 3ef5f66..5034a04 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo155 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit (recording state in git...) [master e32d91a] git-annex in .t/tmprepo157 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 9769419] git-annex in .t/tmprepo158 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo157 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 43d358d] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo157 e32d91a..43d358d master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e32d91a..43d358d Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 conflictor create mode 100644 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo158 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok OK (7.74s) conflict resolution (mixed locked and unlocked file): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 06be3bf] git-annex in .t/tmprepo159 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master f7feb7e] git-annex in .t/tmprepo160 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo160 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor [master 7fb3da9] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo160 f7feb7e..7fb3da9 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f7feb7e..7fb3da9 Fast-forward ok pull r1 From ../../.t/tmprepo159 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo160 f7feb7e..7fb3da9 master -> r2/master ok OK (4.59s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../main1 ok left map in .git/annex/map.dot OK (0.92s) uninit: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was 0f4a4b7). OK (1.37s) uninit (in git-annex branch): Switched to branch 'git-annex' git-annex: cannot uninit when the git-annex branch is checked out OK (0.95s) upgrade: upgrade ok OK (1.61s) whereis: whereis foo (1 copy) d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] ok untrust origin ok (recording state in git...) git-annex: whereis: 1 failed get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) whereis foo (1 copy) 5bcedcd3-0f5e-498b-89fd-112468775b51 -- .t/tmprepo165 [here] The following untrusted locations may also have copies: d2a992c6-eb38-485f-86cc-d784cc94d869 -- test repo [origin] ok OK (1.77s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (2.11s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 13 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 26 KiB/s 0s (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (2.03s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (2.23s) bup remote: OK (0.63s) crypto: OK (1.76s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (5.11s) add subdirs: add dir/foo 100% 24 B 4 KiB/s 0s ok (recording state in git...) add ../dir2/foo 100% 20 B 3 KiB/s 0s ok (recording state in git...) OK (1.28s) addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo175/myurl download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo175/myurl git-annex: addurl: 1 failed addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo175/myurl (to _builddir_build_BUILD_git_annex_7.20191024_test_.t_tmprepo175_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo175/myurl (to addurlurldest) ok (recording state in git...) OK (0.98s) Unit Tests v7 locked Init Tests add dup: init: init test repo (scanning for unlocked files...) ok (recording state in git...) OK (0.26s) add: add foo 100% 20 B 4 KiB/s 0s ok (recording state in git...) add sha1foo 100% 25 B 33 KiB/s 0s ok (recording state in git...) OK (0.66s) All 2 tests passed (0.92s) add foodup 100% 20 B 4 KiB/s 0s ok (recording state in git...) OK (5.53s) add extras: add apple ok (recording state in git...) OK (0.85s) export_import: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok export foo bar.c ok export foo foo ok export foo sha1foo ok (recording state in git...) list foo ok import foo import 100% 16 B 27 KiB/s 0s ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master Updating 7b3aaf9..e2eed98 Fast-forward bar.c | 2 +- import | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 bar.c create mode 120000 import ok add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [master e006793] git-annex in .t/tmprepo178 1 file changed, 1 insertion(+), 1 deletion(-) ok unexport foo import ok export foo import ok (recording state in git...) add import 100% 23 B 4 KiB/s 0s ok (recording state in git...) commit [master 798c13a] git-annex in .t/tmprepo178 1 file changed, 1 insertion(+), 1 deletion(-) ok unsafe to overwrite file git-annex: export: 2 failed list foo ok import foo import 100% 23 B 42 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 4 KiB/s 0s ok add import ok add import ok (recording state in git...) commit [master 9eb1e4d] git-annex in .t/tmprepo178 ok unexport foo import ok export foo import ok (recording state in git...) OK (5.89s) export_import_subdir: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fix subdir/foo ok (recording state in git...) [master 6b8ae17] moved 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 foo create mode 120000 subdir/foo commit On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean ok list foo ok update refs/remotes/foo/master ok (recording state in git...) merge foo/master Merge made by the 'recursive' strategy. ok export foo foo ok (recording state in git...) list foo ok update refs/remotes/foo/master ok merge foo/master Already up to date. ok (recording state in git...) list foo ok update refs/remotes/foo/master ok merge foo/master Updating e8d05c5..a7885b9 Fast-forward ok (recording state in git...) OK (3.00s) shared clone: OK (0.57s) log: + Sat, 26 Oct 2019 06:57:10 UTC foo | bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] OK (0.67s) import: import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) Could not verify that the content is still present in the annex; not removing from the import location. git-annex: import: 1 failed OK (2.94s) reinject: reinject tmpfile (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.98s) unannex (no copy): OK (0.71s) unannex (with copy): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok OK (1.15s) drop (no remote): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed drop foo ok (recording state in git...) OK (1.24s) drop (with remote): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) git-annex: drop: 1 failed numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (1.57s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (1.75s) get: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.22s) get (ssh remote): get foo (from origin...) 100% 20 B 421 B/s 0s (checksum...) ok (recording state in git...) OK (1.07s) move: move foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) move foo (to origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (1.91s) move (ssh remote): move foo (from origin...) 100% 20 B 386 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.94s) copy: copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (1.71s) lock: add newfile 100% 3 B 612 B/s 0s ok (recording state in git...) unlock newfile ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo ok (recording state in git...) unlock foo ok (recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust numcopies.) failed (recording state in git...) git-annex: drop: 1 failed OK (2.36s) lock --force: upgrade ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) git-annex: lock: 1 failed lock foo (checksum...) ok (recording state in git...) OK (1.06s) edit (no pre-commit): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (1.25s) edit (pre-commit): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) (recording state in git...) git-annex: drop: 1 failed OK (1.27s) partial commit: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) (recording state in git...) OK (1.26s) fix: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fix s/foo ok (recording state in git...) OK (1.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.54s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. git-annex: fsck: 2 failed numcopies 1 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 git-annex: fsck: 1 failed fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa git-annex: fsck: 1 failed fsck foo ok fsck sha1foo ok (recording state in git...) OK (2.07s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.50s) fsck (local untrusted): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) Only these untrusted locations may have copies of foo bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] c7f7796f-173a-400a-8643-1b7f2ce247d7 -- .t/tmprepo203 [here] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] Back it up to trusted locations with git-annex copy. git-annex: fsck: 2 failed trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (1.26s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] git-annex: fsck: 2 failed OK (1.39s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.77s) migrate: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (1.96s) migrate (via gitattributes): get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (1.92s) unused: unused . (checking for unused data...) ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) ok commit [master e66d1ec] git-annex in .t/tmprepo208 1 file changed, 1 deletion(-) delete mode 120000 foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking origin/HEAD...) (checking master...) ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok commit [master 477ee3f] git-annex in .t/tmprepo208 1 file changed, 1 deletion(-) delete mode 120000 sha1foo ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) git-annex: dropunused: 1 failed dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok git-annex: 10 not valid (run git annex unused for list) add unusedfile 100% 13 B 2 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (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 2 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile 100% 13 B 3 KiB/s 0s ok (recording state in git...) unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value ok unused . (checking for unused data...) bloomfilter capacity too large to represent; falling back to sane value bloomfilter capacity too large to represent; falling back to sane value ok OK (5.48s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.74s) find: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) add dir/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) OK (1.70s) merge: merge git-annex ok OK (0.61s) info: bloomfilter capacity too large to represent; falling back to sane value OK (0.62s) version: git-annex version: 7.20191024 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 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs hook external operating system: linux arm supported repository versions: 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (4.65s) sync: commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) wanted . ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 4ad501e..0153db9 git-annex -> synced/git-annex ok drop foo ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 0153db9..6eb1744 git-annex -> synced/git-annex ok OK (2.91s) union merge regression: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo216 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok pull r1 From ../../.t/tmprepo215 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo216 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok push r1 To ../../.t/tmprepo215 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo217 * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r1 From ../../.t/tmprepo215 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/git-annex -> r1/synced/git-annex * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo217 * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r2 From ../../.t/tmprepo216 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/git-annex -> r2/synced/git-annex * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r3 From ../../.t/tmprepo217 a905bdd..7ac307c git-annex -> r3/git-annex ok pull r2 From ../../.t/tmprepo216 a905bdd..7479115 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 To ../../.t/tmprepo217 * [new branch] git-annex -> synced/git-annex ok push r2 To ../../.t/tmprepo216 a905bdd..2e7c411 git-annex -> synced/git-annex ok OK (5.94s) adjusted branch merge regression: upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) d36b77d] git-annex in .t/tmprepo218 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 From ../../.t/tmprepo219 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo219 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 2d4de54] git-annex in .t/tmprepo219 1 file changed, 1 insertion(+) create mode 100644 conflictor ok merge synced/master (Merging into master...) Merge made by the 'recursive' strategy. (Merging into adjusted branch...) Updating 2d4de54..f5777ee Fast-forward ok pull r1 From ../../.t/tmprepo218 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo218 3fd0ca6..1cb34b4 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 3fd0ca6..1cb34b4 Fast-forward (Merging into adjusted branch...) Updating 5410757..c43c93e Fast-forward ok pull r2 From ../../.t/tmprepo219 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) 714c111..e3f8d24 git-annex -> r2/git-annex 7b3aaf9..1cb34b4 master -> r2/master 3fd0ca6..1cb34b4 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo218 + 5410757...90e5dbe adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (5.46s) adjusted branch subtree regression: upgrade ok adjust Switched to branch 'adjusted/master(unlocked)' ok add a/b/c/d 100% 3 B 613 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) cedfcfa] git-annex in .t/tmprepo220 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y 100% 3 B 586 B/s 0s ok (recording state in git...) commit [adjusted/master(unlocked) 14487e0] git-annex in .t/tmprepo220 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok Switched to branch 'master' OK (2.13s) conflict resolution: add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [master 339fffc] git-annex in .t/tmprepo221 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [master cb62f9e] git-annex in .t/tmprepo222 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo222 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 4193fee] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo222 cb62f9e..4193fee master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating cb62f9e..4193fee Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 120000 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo221 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo222 cb62f9e..4193fee master -> r2/master ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (3.72s) conflict resolution (adjusted branch): add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [master e3fd444] git-annex in .t/tmprepo223 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor 100% 11 B 2 KiB/s 0s ok (recording state in git...) commit [master eec43fc] git-annex in .t/tmprepo224 1 file changed, 1 insertion(+) create mode 120000 conflictor ok adjust Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo224 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master e4bc01e] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo224 eec43fc..e4bc01e master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating eec43fc..e4bc01e 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 2055041..e28a476 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 From ../../.t/tmprepo223 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo224 + 2055041...695fb0f adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) SHA256E-s11--aa299d36fd0b2f7ec1632ca3834c30c0c2f3b45749058e2611778d38a4a2b7cf 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-a507 (from r1...) SHA256E-s11--d3d3fcb0b6627814a100a087c213b1453a1437cef81a8b1533dfa680f1e68544 11 100% 0.00kB/s 0:00:00 11 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (7.90s) conflict resolution movein regression: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) unlock foo ok (recording state in git...) commit (recording state in git...) [master 30a747c] git-annex in .t/tmprepo225 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 ok pull r2 From ../../.t/tmprepo226 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo226 * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master ok commit (recording state in git...) [master a1045b9] git-annex in .t/tmprepo226 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 ok merge synced/master Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a67d7fd] git-annex automatic merge conflict fix ok pull r1 From ../../.t/tmprepo225 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo225 30a747c..a67d7fd master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 30a747c..a67d7fd Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 ok pull r2 From ../../.t/tmprepo226 244e880..1d04e62 git-annex -> r2/git-annex 7b3aaf9..a67d7fd master -> r2/master 30a747c..a67d7fd synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) SHA256E-s22--79394be9faa623dc4771690b2e237b7ab1194b331430e986381b09184db2acee 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) SHA256E-s22--80614e3445e17591436ae81f21ec70d0597b6bfed6efdaffc9bfd8d44d8a019a 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (6.65s) conflict resolution (mixed directory and file): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 513d6d8] git-annex in .t/tmprepo227 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [master 94aa433] git-annex in .t/tmprepo228 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo228 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master f9ba9dc] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo228 94aa433..f9ba9dc master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 94aa433..f9ba9dc Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo227 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 5d8be0f] git-annex in .t/tmprepo229 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [master 3d2bf55] git-annex in .t/tmprepo230 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo229 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 3fa19d3] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo229 5d8be0f..3fa19d3 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 5d8be0f..3fa19d3 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 120000 conflictor/subfile ok pull r2 From ../../.t/tmprepo230 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7 7 100% 0.00kB/s 0:00:00 7 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) get conflictor.variant-cc12 (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (7.03s) conflict resolution symlink bit: add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master d56e63a] git-annex in .t/tmprepo231 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 6eb1744..2cf5c50 git-annex -> synced/git-annex 7b3aaf9..d56e63a master -> synced/master ok add conflictor/subfile 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [master 912dc6f] git-annex in .t/tmprepo232 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok pull origin From /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 6eb1744..2cf5c50 git-annex -> origin/git-annex 6eb1744..2cf5c50 synced/git-annex -> origin/synced/git-annex 7b3aaf9..d56e63a 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 5100eff] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 2cf5c50..61124ec git-annex -> synced/git-annex d56e63a..5100eff master -> synced/master ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 492d133] git-annex in .t/tmprepo233 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin From /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 6eb1744..61124ec git-annex -> origin/git-annex 6eb1744..61124ec synced/git-annex -> origin/synced/git-annex 7b3aaf9..5100eff 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 8d04f54] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 61124ec..7bb7fd4 git-annex -> synced/git-annex 5100eff..8d04f54 master -> synced/master ok OK (5.81s) conflict resolution (uncommitted local file): add conflictor 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [master 5cb9928] git-annex in .t/tmprepo234 1 file changed, 1 insertion(+) create mode 120000 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo234 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating 7b3aaf9..5cb9928 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating 7b3aaf9..5cb9928 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting To ../../.t/tmprepo234 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo234' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. To ../../.t/tmprepo234 ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo234' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. git-annex: sync: 2 failed add conflictor/file 100% 7 B 1 KiB/s 0s ok (recording state in git...) commit [master dc978ec] git-annex in .t/tmprepo236 1 file changed, 1 insertion(+) create mode 120000 conflictor/file ok On branch master Untracked files: conflictor nothing added to commit but untracked files present From ../../.t/tmprepo236 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating 7b3aaf9..dc978ec error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting Updating 7b3aaf9..dc978ec To ../../.t/tmprepo236 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo236' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. To ../../.t/tmprepo236 ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '../../.t/tmprepo236' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. git-annex: sync: 2 failed OK (4.81s) conflict resolution (removed file): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 32231f9] git-annex in .t/tmprepo238 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo238 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating 7b3aaf9..32231f9 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo238 * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s (checksum...) 0:00:00 (xfr#1, to-chk=0/1) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master fed1b6f] git-annex in .t/tmprepo238 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok pull r2 From ../../.t/tmprepo239 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 To ../../.t/tmprepo239 32231f9..fed1b6f master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit (recording state in git...) [master 96ccecd] git-annex in .t/tmprepo239 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 ok merge synced/master CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 61fa36c] git-annex automatic merge conflict fix ok pull r1 From ../../.t/tmprepo238 aae58a9..b101a58 git-annex -> r1/git-annex 32231f9..fed1b6f master -> r1/master 32231f9..fed1b6f synced/master -> r1/synced/master ok push r1 To ../../.t/tmprepo238 aae58a9..61e02a5 git-annex -> synced/git-annex fed1b6f..61fa36c master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating fed1b6f..61fa36c Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 From ../../.t/tmprepo239 b101a58..61e02a5 git-annex -> r2/git-annex 32231f9..61fa36c master -> r2/master fed1b6f..61fa36c synced/master -> r2/synced/master ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 9f4811e] git-annex in .t/tmprepo240 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo240 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Updating 7b3aaf9..9f4811e Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo240 * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) SHA256E-s10--c01e1c77674217fc7a0ea771949405fbc3a62182d4472c9ee81c8b3015738dc3 10 100% 0.00kB/s 0:00:00 10 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit (recording state in git...) [master 99e1e4a] git-annex in .t/tmprepo241 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 ok pull r1 ok push r1 To ../../.t/tmprepo240 a997e0a..50cea15 git-annex -> synced/git-annex 9f4811e..99e1e4a master -> synced/master ok commit [master cc66f53] git-annex in .t/tmprepo240 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok merge synced/master CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 58bf787] git-annex automatic merge conflict fix ok pull r2 From ../../.t/tmprepo241 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok push r2 To ../../.t/tmprepo241 99e1e4a..58bf787 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 99e1e4a..58bf787 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 From ../../.t/tmprepo240 9f4811e..58bf787 master -> r1/master 99e1e4a..58bf787 synced/master -> r1/synced/master ok OK (14.19s) conflict resolution (nonannexed file): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 9d1e793] git-annex in .t/tmprepo242 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master ef3b4fc] git-annex in .t/tmprepo243 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo243 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master d45bde1] git-annex automatic merge conflict fix Already up to date. ok push r2 To ../../.t/tmprepo243 ef3b4fc..d45bde1 master -> synced/master * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating ef3b4fc..d45bde1 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo242 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 2fd70ab] git-annex in .t/tmprepo244 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master b3e9238] git-annex in .t/tmprepo245 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo244 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 0d064a6] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo244 2fd70ab..0d064a6 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 2fd70ab..0d064a6 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 conflictor create mode 120000 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo245 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok OK (7.40s) conflict resolution (nonannexed symlink): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master e1b0d41] git-annex in .t/tmprepo246 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master e3d73a4] git-annex in .t/tmprepo247 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo247 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master b22084d] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo247 e3d73a4..b22084d master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e3d73a4..b22084d Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 From ../../.t/tmprepo246 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master 1bbbe4b] git-annex in .t/tmprepo248 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 473bef0] git-annex in .t/tmprepo249 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 From ../../.t/tmprepo248 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a7a3863] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 To ../../.t/tmprepo248 1bbbe4b..a7a3863 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 1bbbe4b..a7a3863 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 From ../../.t/tmprepo249 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master ok OK (12.45s) conflict resolution (mixed locked and unlocked file): add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) commit [master ed34741] git-annex in .t/tmprepo250 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor 100% 10 B 2 KiB/s 0s ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master caa6877] git-annex in .t/tmprepo251 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo251 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor [master ed714a4] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 To ../../.t/tmprepo251 caa6877..ed714a4 master -> synced/master * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating caa6877..ed714a4 Fast-forward ok pull r1 From ../../.t/tmprepo250 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 From ../../.t/tmprepo251 caa6877..ed714a4 master -> r2/master ok OK (4.38s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../main2 ok left map in .git/annex/map.dot OK (0.77s) uninit: get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok get sha1foo (from origin...) SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was 7c83311). OK (1.04s) uninit (in git-annex branch): Switched to branch 'git-annex' git-annex: cannot uninit when the git-annex branch is checked out OK (0.91s) upgrade: upgrade ok OK (0.93s) whereis: whereis foo (1 copy) bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] ok untrust origin ok (recording state in git...) git-annex: whereis: 1 failed get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) whereis foo (1 copy) 4ce63824-2453-46ce-b871-bfc189fc7984 -- .t/tmprepo256 [here] The following untrusted locations may also have copies: bf568514-0910-4745-9620-27f99b2f973b -- test repo [origin] ok OK (9.46s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (1.77s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 17 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 26 KiB/s 0s (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (3.38s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) git-annex: drop: 1 failed OK (1.98s) bup remote: OK (0.56s) crypto: OK (3.28s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (4.47s) add subdirs: add dir/foo 100% 24 B 3 KiB/s 0s ok (recording state in git...) commit [master 269d4cd] git-annex in .t/tmprepo265 1 file changed, 1 insertion(+) create mode 120000 dir/foo ok pull origin Merge made by the 'recursive' strategy. conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok push origin To /builddir/build/BUILD/git-annex-7.20191024/test/.t/main2 7bb7fd4..88481de git-annex -> synced/git-annex 8d04f54..c28b2cb master -> synced/master ok add ../dir2/foo 100% 20 B 3 KiB/s 0s ok (recording state in git...) OK (2.01s) addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo266/myurl download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo266/myurl git-annex: addurl: 1 failed addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo266/myurl (to _builddir_build_BUILD_git_annex_7.20191024_test_.t_tmprepo266_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20191024/test/.t/tmprepo266/myurl (to addurlurldest) ok (recording state in git...) OK (1.25s) All 231 tests passed (616.82s) + popd ~/build/BUILD/git-annex-7.20191024 + exit 0 Processing files: git-annex-7.20191024-1.fc30.armv7hl Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.C8Xgh4 + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex + export LC_ALL=C + LC_ALL=C + export DOCDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex + cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex + cp -pr NEWS /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex + cp -pr README /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.LHjjJi + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex + export LC_ALL=C + LC_ALL=C + export LICENSEDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex + exit 0 Provides: git-annex = 7.20191024-1.fc30 git-annex(armv7hl-32) = 7.20191024-1.fc30 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: ld-linux-armhf.so.3 ld-linux-armhf.so.3(GLIBC_2.4) libc.so.6 libc.so.6(GLIBC_2.10) libc.so.6(GLIBC_2.11) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.28) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.6) libc.so.6(GLIBC_2.7) libc.so.6(GLIBC_2.8) libdl.so.2 libdl.so.2(GLIBC_2.4) libffi.so.6 libgcc_s.so.1 libgcc_s.so.1(GCC_3.5) libgmp.so.10 libm.so.6 libm.so.6(GLIBC_2.27) libm.so.6(GLIBC_2.29) libm.so.6(GLIBC_2.4) libmagic.so.1 libpthread.so.0 libpthread.so.0(GLIBC_2.12) libpthread.so.0(GLIBC_2.4) libsqlite3.so.0 libz.so.1 rtld(GNU_HASH) Processing files: git-annex-docs-7.20191024-1.fc30.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.iO23Bf + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/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.20191024-1.fc30.arm/usr/share/doc/git-annex-docs + cp -pr html/ /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/doc/git-annex-docs + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.39LSVm + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/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.20191024-1.fc30.arm/usr/share/licenses/git-annex-docs + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex-docs + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex-docs + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm/usr/share/licenses/git-annex-docs + exit 0 Provides: git-annex-docs = 7.20191024-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.20191024-1.fc30.arm Wrote: /builddir/build/RPMS/git-annex-7.20191024-1.fc30.armv7hl.rpm Wrote: /builddir/build/RPMS/git-annex-docs-7.20191024-1.fc30.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.Hn8D0k + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20191024 + /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-7.20191024-1.fc30.arm + exit 0 Child return code was: 0