Mock Version: 1.4.14 Mock Version: 1.4.14 ENTER ['do'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target s390x --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f30-ghc-15416088-1110532/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=172800uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --target s390x --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: s390x Building for target s390x Wrote: /builddir/build/SRPMS/git-annex-7.20190219-2.fc30.src.rpm Child return code was: 0 ENTER ['do'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target s390x --nodeps /builddir/build/SPECS/git-annex.spec'], chrootPath='/var/lib/mock/f30-ghc-15416088-1110532/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=172800uid=1000gid=425user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --target s390x --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: s390x Building for target s390x Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.ivnuYU + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf git-annex-7.20190219 + /usr/bin/tar -xof - + /usr/bin/gzip -dc /builddir/build/SOURCES/git-annex-7.20190219.tar.gz + STATUS=0 + '[' 0 -ne 0 ']' + cd git-annex-7.20190219 + /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.wPc1yO + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 BUILDSTDERR: ++ echo -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=zEC12 -mtune=z13 -fasynchronous-unwind-tables -fstack-clash-protection BUILDSTDERR: ++ sed -e 's/-Wall //' -e 's/-Werror=format-security //' + CFLAGS='-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=zEC12 -mtune=z13 -fasynchronous-unwind-tables -fstack-clash-protection' + export CFLAGS + export 'LDFLAGS=-Wl,-z,relro -Wl,--as-needed ' + LDFLAGS='-Wl,-z,relro -Wl,--as-needed ' + '[' -f Setup.hs -o -f Setup.lhs ']' + '[' -x Setup ']' + ghc --make -no-user-package-db -dynamic Setup [ 1 of 34] Compiling Utility.Applicative ( Utility/Applicative.hs, Utility/Applicative.o ) [ 2 of 34] Compiling Utility.Data ( Utility/Data.hs, Utility/Data.o ) [ 3 of 34] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, Utility/DebugLocks.o ) [ 4 of 34] Compiling Utility.Exception ( Utility/Exception.hs, Utility/Exception.o ) [ 5 of 34] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, Utility/Env/Basic.o ) [ 6 of 34] Compiling Build.Mans ( Build/Mans.hs, Build/Mans.o ) [ 7 of 34] Compiling Utility.FileSize ( Utility/FileSize.hs, Utility/FileSize.o ) [ 8 of 34] Compiling Utility.Misc ( Utility/Misc.hs, Utility/Misc.o ) [ 9 of 34] Compiling Utility.Monad ( Utility/Monad.hs, Utility/Monad.o ) [10 of 34] Compiling Build.Version ( Build/Version.hs, Build/Version.o ) [11 of 34] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, Utility/PartialPrelude.o ) [12 of 34] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, Utility/Process/Shim.o ) [13 of 34] Compiling Utility.Process ( Utility/Process.hs, Utility/Process.o ) [14 of 34] Compiling Utility.Network ( Utility/Network.hs, Utility/Network.o ) [15 of 34] Compiling Utility.Split ( Utility/Split.hs, Utility/Split.o ) [16 of 34] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, Utility/SafeCommand.o ) [17 of 34] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, Utility/FileSystemEncoding.o ) [18 of 34] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, Utility/SystemDirectory.o ) [19 of 34] Compiling Utility.Tmp ( Utility/Tmp.hs, Utility/Tmp.o ) [20 of 34] Compiling Utility.Directory ( Utility/Directory.hs, Utility/Directory.o ) [21 of 34] Compiling Utility.UserInfo ( Utility/UserInfo.hs, Utility/UserInfo.o ) [22 of 34] Compiling Utility.Path ( Utility/Path.hs, Utility/Path.o ) [23 of 34] Compiling Common ( Common.hs, Common.o ) [24 of 34] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, Utility/DottedVersion.o ) [25 of 34] Compiling Git.Version ( Git/Version.hs, Git/Version.o ) [26 of 34] Compiling Build.TestConfig ( Build/TestConfig.hs, Build/TestConfig.o ) [27 of 34] Compiling Build.Configure ( Build/Configure.hs, Build/Configure.o ) [28 of 34] Compiling Utility.OSX ( Utility/OSX.hs, Utility/OSX.o ) [29 of 34] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, Utility/FreeDesktop.o ) [30 of 34] Compiling Config.Files ( Config/Files.hs, Config/Files.o ) [31 of 34] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, Assistant/Install/Menu.o ) [32 of 34] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, Assistant/Install/AutoStart.o ) [33 of 34] Compiling Build.DesktopFile ( Build/DesktopFile.hs, Build/DesktopFile.o ) [34 of 34] Compiling Main ( Setup.hs, Setup.o ) Linking Setup ... + LANG=C.utf8 + ./Setup --version Cabal library version 2.2.0.1 + '[' -x Setup ']' + LANG=C.utf8 BUILDSTDERR: ++ echo ' -O2' -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=zEC12 -mtune=z13 -fasynchronous-unwind-tables -fstack-clash-protection BUILDSTDERR: ++ sed -e 's/ / -optc/g' BUILDSTDERR: ++ echo ' -Wl,-z,relro' -Wl,--as-needed BUILDSTDERR: ++ sed -e 's/ / -optl/g' + ./Setup configure --prefix=/usr --libdir=/usr/lib64 --docdir=/usr/share/licenses/git-annex '--libsubdir=$compiler/$pkgid' '--datasubdir=$pkgid' '--libexecsubdir=$pkgid' --ghc --dynlibdir=/usr/lib64 --global '--ghc-options= -optc-O2 -optc-g -optc-pipe -optc-Wp,-D_FORTIFY_SOURCE=2 -optc-Wp,-D_GLIBCXX_ASSERTIONS -optc-fexceptions -optc-fstack-protector-strong -optc-grecord-gcc-switches -optc-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -optc-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -optc-m64 -optc-march=zEC12 -optc-mtune=z13 -optc-fasynchronous-unwind-tables -optc-fstack-clash-protection -optl-Wl,-z,relro -optl-Wl,--as-needed' --disable-executable-stripping --disable-library-stripping checking UPGRADE_LOCATION... not available checking git... yes checking git version... 2.21.0 checking cp -a... yes checking cp -p... yes checking cp --preserve=timestamps... yes checking cp --reflink=auto... yes checking xargs -0... yes checking rsync... yes checking curl... yes checking bup... no checking nice... yes checking ionice... yes checking nocache... no checking gpg... not available checking lsof... not available checking git-remote-gcrypt... not available BUILDSTDERR: checking ssh connection caching...fatal: not a git repository (or any of the parent directories): .git yes Configuring git-annex-7.20190219... + '[' -x Setup ']' + LANG=C.utf8 + ./Setup build Preprocessing executable 'git-annex' for git-annex-7.20190219.. Building executable 'git-annex' for git-annex-7.20190219.. [ 1 of 612] Compiling Assistant.Types.BranchChange ( Assistant/Types/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/BranchChange.o ) [ 2 of 612] Compiling Assistant.Types.ThreadName ( Assistant/Types/ThreadName.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadName.o ) [ 3 of 612] Compiling Assistant.Types.TransferSlots ( Assistant/Types/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferSlots.o ) [ 4 of 612] Compiling BuildFlags ( BuildFlags.hs, dist/build/git-annex/git-annex-tmp/BuildFlags.o ) [ 5 of 612] Compiling BuildInfo ( BuildInfo.hs, dist/build/git-annex/git-annex-tmp/BuildInfo.o ) [ 6 of 612] Compiling Build.BundledPrograms ( Build/BundledPrograms.hs, dist/build/git-annex/git-annex-tmp/Build/BundledPrograms.o ) [ 7 of 612] Compiling Config.Cost ( Config/Cost.hs, dist/build/git-annex/git-annex-tmp/Config/Cost.o ) [ 8 of 612] Compiling Types.AdjustedBranch ( Types/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Types/AdjustedBranch.o ) [ 9 of 612] Compiling Types.Availability ( Types/Availability.hs, dist/build/git-annex/git-annex-tmp/Types/Availability.o ) [ 10 of 612] Compiling Types.BranchState ( Types/BranchState.hs, dist/build/git-annex/git-annex-tmp/Types/BranchState.o ) [ 11 of 612] Compiling Types.Concurrency ( Types/Concurrency.hs, dist/build/git-annex/git-annex-tmp/Types/Concurrency.o ) [ 12 of 612] Compiling Types.Creds ( Types/Creds.hs, dist/build/git-annex/git-annex-tmp/Types/Creds.o ) [ 13 of 612] Compiling Assistant.Types.CredPairCache ( Assistant/Types/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/CredPairCache.o ) [ 14 of 612] Compiling Types.DesktopNotify ( Types/DesktopNotify.hs, dist/build/git-annex/git-annex-tmp/Types/DesktopNotify.o ) [ 15 of 612] Compiling Types.Key ( Types/Key.hs, dist/build/git-annex/git-annex-tmp/Types/Key.o ) [ 16 of 612] Compiling Types.RepoVersion ( Types/RepoVersion.hs, dist/build/git-annex/git-annex-tmp/Types/RepoVersion.o ) [ 17 of 612] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/build/git-annex/git-annex-tmp/Utility/Applicative.o ) [ 18 of 612] Compiling Utility.Bloom ( Utility/Bloom.hs, dist/build/git-annex/git-annex-tmp/Utility/Bloom.o ) [ 19 of 612] Compiling Utility.Data ( Utility/Data.hs, dist/build/git-annex/git-annex-tmp/Utility/Data.o ) [ 20 of 612] Compiling Utility.DebugLocks ( Utility/DebugLocks.hs, dist/build/git-annex/git-annex-tmp/Utility/DebugLocks.o ) [ 21 of 612] Compiling Utility.Dot ( Utility/Dot.hs, dist/build/git-annex/git-annex-tmp/Utility/Dot.o ) [ 22 of 612] Compiling Utility.Env ( Utility/Env.hs, dist/build/git-annex/git-annex-tmp/Utility/Env.o ) [ 23 of 612] Compiling Utility.Env.Set ( Utility/Env/Set.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Set.o ) [ 24 of 612] Compiling Utility.Exception ( Utility/Exception.hs, dist/build/git-annex/git-annex-tmp/Utility/Exception.o ) [ 25 of 612] Compiling Utility.Env.Basic ( Utility/Env/Basic.hs, dist/build/git-annex/git-annex-tmp/Utility/Env/Basic.o ) [ 26 of 612] Compiling Utility.DiskFree ( Utility/DiskFree.hs, dist/build/git-annex/git-annex-tmp/Utility/DiskFree.o ) [ 27 of 612] Compiling Build.Mans ( Build/Mans.hs, dist/build/git-annex/git-annex-tmp/Build/Mans.o ) [ 28 of 612] Compiling Utility.FileMode ( Utility/FileMode.hs, dist/build/git-annex/git-annex-tmp/Utility/FileMode.o ) [ 29 of 612] Compiling Git.FileMode ( Git/FileMode.hs, dist/build/git-annex/git-annex-tmp/Git/FileMode.o ) [ 30 of 612] Compiling Utility.FileSize ( Utility/FileSize.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSize.o ) [ 31 of 612] Compiling Utility.Glob ( Utility/Glob.hs, dist/build/git-annex/git-annex-tmp/Utility/Glob.o ) [ 32 of 612] Compiling Utility.Hash ( Utility/Hash.hs, dist/build/git-annex/git-annex-tmp/Utility/Hash.o ) [ 33 of 612] Compiling Utility.HtmlDetect ( Utility/HtmlDetect.hs, dist/build/git-annex/git-annex-tmp/Utility/HtmlDetect.o ) [ 34 of 612] Compiling Utility.HttpManagerRestricted ( Utility/HttpManagerRestricted.hs, dist/build/git-annex/git-annex-tmp/Utility/HttpManagerRestricted.o ) [ 35 of 612] Compiling Utility.HumanNumber ( Utility/HumanNumber.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanNumber.o ) [ 36 of 612] Compiling Utility.DataUnits ( Utility/DataUnits.hs, dist/build/git-annex/git-annex-tmp/Utility/DataUnits.o ) [ 37 of 612] Compiling Utility.IPAddress ( Utility/IPAddress.hs, dist/build/git-annex/git-annex-tmp/Utility/IPAddress.o ) [ 38 of 612] Compiling Utility.LockFile.LockStatus ( Utility/LockFile/LockStatus.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/LockStatus.o ) [ 39 of 612] Compiling Utility.LockFile.Posix ( Utility/LockFile/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/Posix.o ) [ 40 of 612] Compiling Utility.LockFile ( Utility/LockFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile.o ) [ 41 of 612] Compiling Utility.Misc ( Utility/Misc.hs, dist/build/git-annex/git-annex-tmp/Utility/Misc.o ) [ 42 of 612] Compiling Utility.Monad ( Utility/Monad.hs, dist/build/git-annex/git-annex-tmp/Utility/Monad.o ) [ 43 of 612] Compiling Utility.LockPool.STM ( Utility/LockPool/STM.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/STM.o ) [ 44 of 612] Compiling Utility.LockPool.LockHandle ( Utility/LockPool/LockHandle.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/LockHandle.o ) [ 45 of 612] Compiling Utility.LockPool.Posix ( Utility/LockPool/Posix.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/Posix.o ) [ 46 of 612] Compiling Utility.LockPool ( Utility/LockPool.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool.o ) [ 47 of 612] Compiling Types.LockCache ( Types/LockCache.hs, dist/build/git-annex/git-annex-tmp/Types/LockCache.o ) [ 48 of 612] Compiling Build.Version ( Build/Version.hs, dist/build/git-annex/git-annex-tmp/Build/Version.o ) [ 49 of 612] Compiling Utility.Mounts ( Utility/Mounts.hs, dist/build/git-annex/git-annex-tmp/Utility/Mounts.o ) [ 50 of 612] Compiling Utility.OptParse ( Utility/OptParse.hs, dist/build/git-annex/git-annex-tmp/Utility/OptParse.o ) [ 51 of 612] Compiling Utility.PID ( Utility/PID.hs, dist/build/git-annex/git-annex-tmp/Utility/PID.o ) [ 52 of 612] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/build/git-annex/git-annex-tmp/Utility/PartialPrelude.o ) [ 53 of 612] Compiling Utility.Format ( Utility/Format.hs, dist/build/git-annex/git-annex-tmp/Utility/Format.o ) [ 54 of 612] Compiling Utility.DBus ( Utility/DBus.hs, dist/build/git-annex/git-annex-tmp/Utility/DBus.o ) [ 55 of 612] Compiling Utility.Path.Max ( Utility/Path/Max.hs, dist/build/git-annex/git-annex-tmp/Utility/Path/Max.o ) [ 56 of 612] Compiling Utility.Percentage ( Utility/Percentage.hs, dist/build/git-annex/git-annex-tmp/Utility/Percentage.o ) [ 57 of 612] Compiling Utility.Process.Shim ( Utility/Process/Shim.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Shim.o ) [ 58 of 612] Compiling Utility.Process ( Utility/Process.hs, dist/build/git-annex/git-annex-tmp/Utility/Process.o ) [ 59 of 612] Compiling Utility.Network ( Utility/Network.hs, dist/build/git-annex/git-annex-tmp/Utility/Network.o ) [ 60 of 612] Compiling Utility.Process.Transcript ( Utility/Process/Transcript.hs, dist/build/git-annex/git-annex-tmp/Utility/Process/Transcript.o ) [ 61 of 612] Compiling Utility.QuickCheck ( Utility/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/QuickCheck.o ) [ 62 of 612] Compiling Utility.HumanTime ( Utility/HumanTime.hs, dist/build/git-annex/git-annex-tmp/Utility/HumanTime.o ) [ 63 of 612] Compiling Utility.RawFilePath ( Utility/RawFilePath.hs, dist/build/git-annex/git-annex-tmp/Utility/RawFilePath.o ) [ 64 of 612] Compiling Utility.Split ( Utility/Split.hs, dist/build/git-annex/git-annex-tmp/Utility/Split.o ) [ 65 of 612] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/build/git-annex/git-annex-tmp/Utility/SafeCommand.o ) [ 66 of 612] Compiling Utility.Shell ( Utility/Shell.hs, dist/build/git-annex/git-annex-tmp/Utility/Shell.o ) [ 67 of 612] Compiling Git.Types ( Git/Types.hs, dist/build/git-annex/git-annex-tmp/Git/Types.o ) [ 68 of 612] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/build/git-annex/git-annex-tmp/Utility/FileSystemEncoding.o ) [ 69 of 612] Compiling Utility.Base64 ( Utility/Base64.hs, dist/build/git-annex/git-annex-tmp/Utility/Base64.o ) [ 70 of 612] Compiling Utility.Aeson ( Utility/Aeson.hs, dist/build/git-annex/git-annex-tmp/Utility/Aeson.o ) [ 71 of 612] Compiling Types.Messages ( Types/Messages.hs, dist/build/git-annex/git-annex-tmp/Types/Messages.o ) [ 72 of 612] Compiling Database.Handle ( Database/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Handle.o ) [ 73 of 612] Compiling Database.Queue ( Database/Queue.hs, dist/build/git-annex/git-annex-tmp/Database/Queue.o ) [ 74 of 612] Compiling Database.Keys.Handle ( Database/Keys/Handle.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/Handle.o ) [ 75 of 612] Compiling Utility.SshHost ( Utility/SshHost.hs, dist/build/git-annex/git-annex-tmp/Utility/SshHost.o ) [ 76 of 612] Compiling Utility.SystemDirectory ( Utility/SystemDirectory.hs, dist/build/git-annex/git-annex-tmp/Utility/SystemDirectory.o ) [ 77 of 612] Compiling Utility.Tense ( Utility/Tense.hs, dist/build/git-annex/git-annex-tmp/Utility/Tense.o ) [ 78 of 612] Compiling Assistant.Types.Alert ( Assistant/Types/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Alert.o ) [ 79 of 612] Compiling Utility.ThreadLock ( Utility/ThreadLock.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadLock.o ) [ 80 of 612] Compiling Utility.ThreadScheduler ( Utility/ThreadScheduler.hs, dist/build/git-annex/git-annex-tmp/Utility/ThreadScheduler.o ) [ 81 of 612] Compiling Utility.TimeStamp ( Utility/TimeStamp.hs, dist/build/git-annex/git-annex-tmp/Utility/TimeStamp.o ) [ 82 of 612] Compiling Annex.VectorClock ( Annex/VectorClock.hs, dist/build/git-annex/git-annex-tmp/Annex/VectorClock.o ) [ 83 of 612] Compiling Utility.Tmp ( Utility/Tmp.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp.o ) [ 84 of 612] Compiling Utility.Directory ( Utility/Directory.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory.o ) [ 85 of 612] Compiling Utility.Directory.Stream ( Utility/Directory/Stream.hs, dist/build/git-annex/git-annex-tmp/Utility/Directory/Stream.o ) [ 86 of 612] Compiling Utility.Tmp.Dir ( Utility/Tmp/Dir.hs, dist/build/git-annex/git-annex-tmp/Utility/Tmp/Dir.o ) [ 87 of 612] Compiling Utility.Touch ( Utility/Touch.hs, dist/build/git-annex/git-annex-tmp/Utility/Touch.o ) [ 88 of 612] Compiling Utility.Tuple ( Utility/Tuple.hs, dist/build/git-annex/git-annex-tmp/Utility/Tuple.o ) [ 89 of 612] Compiling Utility.Scheduled ( Utility/Scheduled.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled.o ) [ 90 of 612] Compiling Utility.Scheduled.QuickCheck ( Utility/Scheduled/QuickCheck.hs, dist/build/git-annex/git-annex-tmp/Utility/Scheduled/QuickCheck.o ) [ 91 of 612] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/build/git-annex/git-annex-tmp/Utility/UserInfo.o ) [ 92 of 612] Compiling Utility.Path ( Utility/Path.hs, dist/build/git-annex/git-annex-tmp/Utility/Path.o ) [ 93 of 612] Compiling Utility.MagicWormhole ( Utility/MagicWormhole.hs, dist/build/git-annex/git-annex-tmp/Utility/MagicWormhole.o ) [ 94 of 612] Compiling Utility.LockFile.PidLock ( Utility/LockFile/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockFile/PidLock.o ) [ 95 of 612] Compiling Utility.LockPool.PidLock ( Utility/LockPool/PidLock.hs, dist/build/git-annex/git-annex-tmp/Utility/LockPool/PidLock.o ) [ 96 of 612] Compiling Utility.LinuxMkLibs ( Utility/LinuxMkLibs.hs, dist/build/git-annex/git-annex-tmp/Utility/LinuxMkLibs.o ) [ 97 of 612] Compiling Common ( Common.hs, dist/build/git-annex/git-annex-tmp/Common.o ) [ 98 of 612] Compiling Utility.Tor ( Utility/Tor.hs, dist/build/git-annex/git-annex-tmp/Utility/Tor.o ) [ 99 of 612] Compiling Utility.TList ( Utility/TList.hs, dist/build/git-annex/git-annex-tmp/Utility/TList.o ) [100 of 612] Compiling Assistant.Types.Commits ( Assistant/Types/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Commits.o ) [101 of 612] Compiling Utility.Su ( Utility/Su.hs, dist/build/git-annex/git-annex-tmp/Utility/Su.o ) [102 of 612] Compiling Utility.SshConfig ( Utility/SshConfig.hs, dist/build/git-annex/git-annex-tmp/Utility/SshConfig.o ) [103 of 612] Compiling Utility.SimpleProtocol ( Utility/SimpleProtocol.hs, dist/build/git-annex/git-annex-tmp/Utility/SimpleProtocol.o ) [104 of 612] Compiling Utility.AuthToken ( Utility/AuthToken.hs, dist/build/git-annex/git-annex-tmp/Utility/AuthToken.o ) [105 of 612] Compiling Types.UUID ( Types/UUID.hs, dist/build/git-annex/git-annex-tmp/Types/UUID.o ) [106 of 612] Compiling Types.TrustLevel ( Types/TrustLevel.hs, dist/build/git-annex/git-annex-tmp/Types/TrustLevel.o ) [107 of 612] Compiling Types.NumCopies ( Types/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Types/NumCopies.o ) [108 of 612] Compiling Types.Group ( Types/Group.hs, dist/build/git-annex/git-annex-tmp/Types/Group.o ) [109 of 612] Compiling Utility.Parallel ( Utility/Parallel.hs, dist/build/git-annex/git-annex-tmp/Utility/Parallel.o ) [110 of 612] Compiling Utility.NotificationBroadcaster ( Utility/NotificationBroadcaster.hs, dist/build/git-annex/git-annex-tmp/Utility/NotificationBroadcaster.o ) [111 of 612] Compiling Utility.Metered ( Utility/Metered.hs, dist/build/git-annex/git-annex-tmp/Utility/Metered.o ) [112 of 612] Compiling Utility.Url ( Utility/Url.hs, dist/build/git-annex/git-annex-tmp/Utility/Url.o ) [113 of 612] Compiling Types.UrlContents ( Types/UrlContents.hs, dist/build/git-annex/git-annex-tmp/Types/UrlContents.o ) [114 of 612] Compiling Types.CleanupActions ( Types/CleanupActions.hs, dist/build/git-annex/git-annex-tmp/Types/CleanupActions.o ) [115 of 612] Compiling Utility.Rsync ( Utility/Rsync.hs, dist/build/git-annex/git-annex-tmp/Utility/Rsync.o ) [116 of 612] Compiling Utility.Matcher ( Utility/Matcher.hs, dist/build/git-annex/git-annex-tmp/Utility/Matcher.o ) [117 of 612] Compiling Types.FileMatcher ( Types/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Types/FileMatcher.o ) [118 of 612] Compiling Utility.Lsof ( Utility/Lsof.hs, dist/build/git-annex/git-annex-tmp/Utility/Lsof.o ) [119 of 612] Compiling Utility.LogFile ( Utility/LogFile.hs, dist/build/git-annex/git-annex-tmp/Utility/LogFile.o ) [120 of 612] Compiling Utility.InodeCache ( Utility/InodeCache.hs, dist/build/git-annex/git-annex-tmp/Utility/InodeCache.o ) [121 of 612] Compiling Types.KeySource ( Types/KeySource.hs, dist/build/git-annex/git-annex-tmp/Types/KeySource.o ) [122 of 612] Compiling Types.Backend ( Types/Backend.hs, dist/build/git-annex/git-annex-tmp/Types/Backend.o ) [123 of 612] Compiling Utility.Gpg ( Utility/Gpg.hs, dist/build/git-annex/git-annex-tmp/Utility/Gpg.o ) [124 of 612] Compiling Types.Crypto ( Types/Crypto.hs, dist/build/git-annex/git-annex-tmp/Types/Crypto.o ) [125 of 612] Compiling Utility.DottedVersion ( Utility/DottedVersion.hs, dist/build/git-annex/git-annex-tmp/Utility/DottedVersion.o ) [126 of 612] Compiling Utility.DirWatcher.Types ( Utility/DirWatcher/Types.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/Types.o ) [127 of 612] Compiling Utility.DirWatcher.INotify ( Utility/DirWatcher/INotify.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher/INotify.o ) [128 of 612] Compiling Utility.DirWatcher ( Utility/DirWatcher.hs, dist/build/git-annex/git-annex-tmp/Utility/DirWatcher.o ) [129 of 612] Compiling Utility.Daemon ( Utility/Daemon.hs, dist/build/git-annex/git-annex-tmp/Utility/Daemon.o ) [130 of 612] Compiling Utility.CopyFile ( Utility/CopyFile.hs, dist/build/git-annex/git-annex-tmp/Utility/CopyFile.o ) [131 of 612] Compiling Utility.CoProcess ( Utility/CoProcess.hs, dist/build/git-annex/git-annex-tmp/Utility/CoProcess.o ) [132 of 612] Compiling Utility.Batch ( Utility/Batch.hs, dist/build/git-annex/git-annex-tmp/Utility/Batch.o ) [133 of 612] Compiling Utility.Android ( Utility/Android.hs, dist/build/git-annex/git-annex-tmp/Utility/Android.o ) [134 of 612] Compiling Types.ScheduledActivity ( Types/ScheduledActivity.hs, dist/build/git-annex/git-annex-tmp/Types/ScheduledActivity.o ) [135 of 612] Compiling Types.RefSpec ( Types/RefSpec.hs, dist/build/git-annex/git-annex-tmp/Types/RefSpec.o ) [136 of 612] Compiling Types.MetaData ( Types/MetaData.hs, dist/build/git-annex/git-annex-tmp/Types/MetaData.o ) [137 of 612] Compiling Annex.MetaData.StandardFields ( Annex/MetaData/StandardFields.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData/StandardFields.o ) [138 of 612] Compiling Logs.Line ( Logs/Line.hs, dist/build/git-annex/git-annex-tmp/Logs/Line.o ) [139 of 612] Compiling Logs.MapLog ( Logs/MapLog.hs, dist/build/git-annex/git-annex-tmp/Logs/MapLog.o ) [140 of 612] Compiling Logs.UUIDBased ( Logs/UUIDBased.hs, dist/build/git-annex/git-annex-tmp/Logs/UUIDBased.o ) [141 of 612] Compiling Key ( Key.hs, dist/build/git-annex/git-annex-tmp/Key.o ) [142 of 612] Compiling Messages.JSON ( Messages/JSON.hs, dist/build/git-annex/git-annex-tmp/Messages/JSON.o ) [143 of 612] Compiling Database.Types ( Database/Types.hs, dist/build/git-annex/git-annex-tmp/Database/Types.o ) [144 of 612] Compiling Git.Version ( Git/Version.hs, dist/build/git-annex/git-annex-tmp/Git/Version.o ) [145 of 612] Compiling Git.BuildVersion ( Git/BuildVersion.hs, dist/build/git-annex/git-annex-tmp/Git/BuildVersion.o ) [146 of 612] Compiling Git.Ssh ( Git/Ssh.hs, dist/build/git-annex/git-annex-tmp/Git/Ssh.o ) [147 of 612] Compiling Git.Sha ( Git/Sha.hs, dist/build/git-annex/git-annex-tmp/Git/Sha.o ) [148 of 612] Compiling Git.LockFile ( Git/LockFile.hs, dist/build/git-annex/git-annex-tmp/Git/LockFile.o ) [149 of 612] Compiling Git.Filename ( Git/Filename.hs, dist/build/git-annex/git-annex-tmp/Git/Filename.o ) [150 of 612] Compiling Git ( Git.hs, dist/build/git-annex/git-annex-tmp/Git.o ) [151 of 612] Compiling Git.Url ( Git/Url.hs, dist/build/git-annex/git-annex-tmp/Git/Url.o ) [152 of 612] Compiling Git.Remote ( Git/Remote.hs, dist/build/git-annex/git-annex-tmp/Git/Remote.o ) [153 of 612] Compiling Git.Objects ( Git/Objects.hs, dist/build/git-annex/git-annex-tmp/Git/Objects.o ) [154 of 612] Compiling Git.Index ( Git/Index.hs, dist/build/git-annex/git-annex-tmp/Git/Index.o ) [155 of 612] Compiling Git.Hook ( Git/Hook.hs, dist/build/git-annex/git-annex-tmp/Git/Hook.o ) [156 of 612] Compiling Git.FilePath ( Git/FilePath.hs, dist/build/git-annex/git-annex-tmp/Git/FilePath.o ) [157 of 612] Compiling Types.Export ( Types/Export.hs, dist/build/git-annex/git-annex-tmp/Types/Export.o ) [158 of 612] Compiling Git.DiffTreeItem ( Git/DiffTreeItem.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTreeItem.o ) [159 of 612] Compiling Database.Keys.SQL ( Database/Keys/SQL.hs, dist/build/git-annex/git-annex-tmp/Database/Keys/SQL.o ) [160 of 612] Compiling Git.Env ( Git/Env.hs, dist/build/git-annex/git-annex-tmp/Git/Env.o ) [161 of 612] Compiling Git.Command ( Git/Command.hs, dist/build/git-annex/git-annex-tmp/Git/Command.o ) [162 of 612] Compiling Git.UpdateIndex ( Git/UpdateIndex.hs, dist/build/git-annex/git-annex-tmp/Git/UpdateIndex.o ) [163 of 612] Compiling Git.Status ( Git/Status.hs, dist/build/git-annex/git-annex-tmp/Git/Status.o ) [164 of 612] Compiling Git.Remote.Remove ( Git/Remote/Remove.hs, dist/build/git-annex/git-annex-tmp/Git/Remote/Remove.o ) [165 of 612] Compiling Git.RefLog ( Git/RefLog.hs, dist/build/git-annex/git-annex-tmp/Git/RefLog.o ) [166 of 612] Compiling Git.Ref ( Git/Ref.hs, dist/build/git-annex/git-annex-tmp/Git/Ref.o ) [167 of 612] Compiling Git.Queue ( Git/Queue.hs, dist/build/git-annex/git-annex-tmp/Git/Queue.o ) [168 of 612] Compiling Git.LsTree ( Git/LsTree.hs, dist/build/git-annex/git-annex-tmp/Git/LsTree.o ) [169 of 612] Compiling Git.Tree ( Git/Tree.hs, dist/build/git-annex/git-annex-tmp/Git/Tree.o ) [170 of 612] Compiling Git.LsFiles ( Git/LsFiles.hs, dist/build/git-annex/git-annex-tmp/Git/LsFiles.o ) [171 of 612] Compiling Git.HashObject ( Git/HashObject.hs, dist/build/git-annex/git-annex-tmp/Git/HashObject.o ) [172 of 612] Compiling Git.Fsck ( Git/Fsck.hs, dist/build/git-annex/git-annex-tmp/Git/Fsck.o ) [173 of 612] Compiling Git.DiffTree ( Git/DiffTree.hs, dist/build/git-annex/git-annex-tmp/Git/DiffTree.o ) [174 of 612] Compiling Git.Command.Batch ( Git/Command/Batch.hs, dist/build/git-annex/git-annex-tmp/Git/Command/Batch.o ) [175 of 612] Compiling Git.CheckIgnore ( Git/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Git/CheckIgnore.o ) [176 of 612] Compiling Git.CheckAttr ( Git/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Git/CheckAttr.o ) [177 of 612] Compiling Git.CatFile ( Git/CatFile.hs, dist/build/git-annex/git-annex-tmp/Git/CatFile.o ) [178 of 612] Compiling Git.UnionMerge ( Git/UnionMerge.hs, dist/build/git-annex/git-annex-tmp/Git/UnionMerge.o ) [179 of 612] Compiling Annex.AdjustedBranch.Name ( Annex/AdjustedBranch/Name.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch/Name.o ) [180 of 612] Compiling Config.DynamicConfig ( Config/DynamicConfig.hs, dist/build/git-annex/git-annex-tmp/Config/DynamicConfig.o ) [181 of 612] Compiling Annex.Magic ( Annex/Magic.hs, dist/build/git-annex/git-annex-tmp/Annex/Magic.o ) [182 of 612] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/build/git-annex/git-annex-tmp/Build/TestConfig.o ) [183 of 612] Compiling Build.Configure ( Build/Configure.hs, dist/build/git-annex/git-annex-tmp/Build/Configure.o ) [184 of 612] Compiling Utility.OSX ( Utility/OSX.hs, dist/build/git-annex/git-annex-tmp/Utility/OSX.o ) [185 of 612] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, dist/build/git-annex/git-annex-tmp/Utility/FreeDesktop.o ) [186 of 612] Compiling Config.Files ( Config/Files.hs, dist/build/git-annex/git-annex-tmp/Config/Files.o ) [187 of 612] Compiling Annex.Path ( Annex/Path.hs, dist/build/git-annex/git-annex-tmp/Annex/Path.o ) [188 of 612] Compiling Annex.Multicast ( Annex/Multicast.hs, dist/build/git-annex/git-annex-tmp/Annex/Multicast.o ) [189 of 612] Compiling Assistant.Install.Menu ( Assistant/Install/Menu.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/Menu.o ) [190 of 612] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install/AutoStart.o ) [191 of 612] Compiling Build.DesktopFile ( Build/DesktopFile.hs, dist/build/git-annex/git-annex-tmp/Build/DesktopFile.o ) [192 of 612] Compiling Git.Construct ( Git/Construct.hs, dist/build/git-annex/git-annex-tmp/Git/Construct.o ) [193 of 612] Compiling Git.Config ( Git/Config.hs, dist/build/git-annex/git-annex-tmp/Git/Config.o ) [194 of 612] Compiling Types.Distribution ( Types/Distribution.hs, dist/build/git-annex/git-annex-tmp/Types/Distribution.o ) [195 of 612] Compiling Types.Difference ( Types/Difference.hs, dist/build/git-annex/git-annex-tmp/Types/Difference.o ) [196 of 612] Compiling Git.GCrypt ( Git/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Git/GCrypt.o ) [197 of 612] Compiling Git.CurrentRepo ( Git/CurrentRepo.hs, dist/build/git-annex/git-annex-tmp/Git/CurrentRepo.o ) [198 of 612] Compiling Git.ConfigTypes ( Git/ConfigTypes.hs, dist/build/git-annex/git-annex-tmp/Git/ConfigTypes.o ) [199 of 612] Compiling Types.GitConfig ( Types/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Types/GitConfig.o ) [200 of 612] Compiling Types.Remote ( Types/Remote.hs, dist/build/git-annex/git-annex-tmp/Types/Remote.o ) [201 of 612] Compiling Types.StandardGroups ( Types/StandardGroups.hs, dist/build/git-annex/git-annex-tmp/Types/StandardGroups.o ) [202 of 612] Compiling Annex.DirHashes ( Annex/DirHashes.hs, dist/build/git-annex/git-annex-tmp/Annex/DirHashes.o ) [203 of 612] Compiling Git.Branch ( Git/Branch.hs, dist/build/git-annex/git-annex-tmp/Git/Branch.o ) [204 of 612] Compiling Git.Repair ( Git/Repair.hs, dist/build/git-annex/git-annex-tmp/Git/Repair.o ) [205 of 612] Compiling Git.Merge ( Git/Merge.hs, dist/build/git-annex/git-annex-tmp/Git/Merge.o ) [206 of 612] Compiling Git.AutoCorrect ( Git/AutoCorrect.hs, dist/build/git-annex/git-annex-tmp/Git/AutoCorrect.o ) [207 of 612] Compiling Annex.Fixup ( Annex/Fixup.hs, dist/build/git-annex/git-annex-tmp/Annex/Fixup.o ) [208 of 612] Compiling Annex.Locations ( Annex/Locations.hs, dist/build/git-annex/git-annex-tmp/Annex/Locations.o ) [209 of 612] Compiling Annex ( Annex.hs, dist/build/git-annex/git-annex-tmp/Annex.o ) [210 of 612] Compiling Types.DeferredParse ( Types/DeferredParse.hs, dist/build/git-annex/git-annex-tmp/Types/DeferredParse.o ) [211 of 612] Compiling Types ( Types.hs, dist/build/git-annex/git-annex-tmp/Types.o ) [212 of 612] Compiling Types.Transfer ( Types/Transfer.hs, dist/build/git-annex/git-annex-tmp/Types/Transfer.o ) [213 of 612] Compiling Types.ActionItem ( Types/ActionItem.hs, dist/build/git-annex/git-annex-tmp/Types/ActionItem.o ) [214 of 612] Compiling Types.Command ( Types/Command.hs, dist/build/git-annex/git-annex-tmp/Types/Command.o ) [215 of 612] Compiling Types.Test ( Types/Test.hs, dist/build/git-annex/git-annex-tmp/Types/Test.o ) [216 of 612] Compiling Types.Benchmark ( Types/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Types/Benchmark.o ) [217 of 612] Compiling Remote.WebDAV.DavLocation ( Remote/WebDAV/DavLocation.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV/DavLocation.o ) [218 of 612] Compiling Remote.Rsync.RsyncUrl ( Remote/Rsync/RsyncUrl.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync/RsyncUrl.o ) [219 of 612] Compiling Assistant.Types.RepoProblem ( Assistant/Types/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RepoProblem.o ) [220 of 612] Compiling Messages.Concurrent ( Messages/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Messages/Concurrent.o ) [221 of 612] Compiling Messages.Internal ( Messages/Internal.hs, dist/build/git-annex/git-annex-tmp/Messages/Internal.o ) [222 of 612] Compiling Messages ( Messages.hs, dist/build/git-annex/git-annex-tmp/Messages.o ) [223 of 612] Compiling Messages.Progress ( Messages/Progress.hs, dist/build/git-annex/git-annex-tmp/Messages/Progress.o ) [224 of 612] Compiling CmdLine.GlobalSetter ( CmdLine/GlobalSetter.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GlobalSetter.o ) [225 of 612] Compiling Annex.LockPool.PosixOrPid ( Annex/LockPool/PosixOrPid.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool/PosixOrPid.o ) [226 of 612] Compiling Annex.LockPool ( Annex/LockPool.hs, dist/build/git-annex/git-annex-tmp/Annex/LockPool.o ) [227 of 612] Compiling Annex.Common ( Annex/Common.hs, dist/build/git-annex/git-annex-tmp/Annex/Common.o ) [228 of 612] Compiling Types.View ( Types/View.hs, dist/build/git-annex/git-annex-tmp/Types/View.o ) [229 of 612] Compiling Types.StoreRetrieve ( Types/StoreRetrieve.hs, dist/build/git-annex/git-annex-tmp/Types/StoreRetrieve.o ) [230 of 612] Compiling Remote.Helper.ReadOnly ( Remote/Helper/ReadOnly.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/ReadOnly.o ) [231 of 612] Compiling Remote.Helper.Messages ( Remote/Helper/Messages.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Messages.o ) [232 of 612] Compiling Remote.Helper.Git ( Remote/Helper/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Git.o ) [233 of 612] Compiling Remote.External.Types ( Remote/External/Types.hs, dist/build/git-annex/git-annex-tmp/Remote/External/Types.o ) [234 of 612] Compiling Logs.Trust.Pure ( Logs/Trust/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Pure.o ) [235 of 612] Compiling Logs.Transitions ( Logs/Transitions.hs, dist/build/git-annex/git-annex-tmp/Logs/Transitions.o ) [236 of 612] Compiling Logs.SingleValue.Pure ( Logs/SingleValue/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue/Pure.o ) [237 of 612] Compiling Logs.MetaData.Pure ( Logs/MetaData/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData/Pure.o ) [238 of 612] Compiling Logs.Presence.Pure ( Logs/Presence/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence/Pure.o ) [239 of 612] Compiling Logs.Difference.Pure ( Logs/Difference/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference/Pure.o ) [240 of 612] Compiling Logs.Chunk.Pure ( Logs/Chunk/Pure.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk/Pure.o ) [241 of 612] Compiling Logs ( Logs.hs, dist/build/git-annex/git-annex-tmp/Logs.o ) [242 of 612] Compiling Annex.Branch.Transitions ( Annex/Branch/Transitions.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch/Transitions.o ) [243 of 612] Compiling Crypto ( Crypto.hs, dist/build/git-annex/git-annex-tmp/Crypto.o ) [244 of 612] Compiling Config ( Config.hs, dist/build/git-annex/git-annex-tmp/Config.o ) [245 of 612] Compiling Remote.Helper.Encryptable ( Remote/Helper/Encryptable.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Encryptable.o ) [246 of 612] Compiling Config.Smudge ( Config/Smudge.hs, dist/build/git-annex/git-annex-tmp/Config/Smudge.o ) [247 of 612] Compiling CmdLine.Usage ( CmdLine/Usage.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Usage.o ) [248 of 612] Compiling CmdLine.Option ( CmdLine/Option.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Option.o ) [249 of 612] Compiling CmdLine.GitAnnexShell.Fields ( CmdLine/GitAnnexShell/Fields.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Fields.o ) [250 of 612] Compiling Backend.Utilities ( Backend/Utilities.hs, dist/build/git-annex/git-annex-tmp/Backend/Utilities.o ) [251 of 612] Compiling Backend.WORM ( Backend/WORM.hs, dist/build/git-annex/git-annex-tmp/Backend/WORM.o ) [252 of 612] Compiling Backend.URL ( Backend/URL.hs, dist/build/git-annex/git-annex-tmp/Backend/URL.o ) [253 of 612] Compiling Backend.Hash ( Backend/Hash.hs, dist/build/git-annex/git-annex-tmp/Backend/Hash.o ) [254 of 612] Compiling Assistant.Types.TransferQueue ( Assistant/Types/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferQueue.o ) [255 of 612] Compiling Assistant.Types.ThreadedMonad ( Assistant/Types/ThreadedMonad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ThreadedMonad.o ) [256 of 612] Compiling Assistant.Types.ScanRemotes ( Assistant/Types/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/ScanRemotes.o ) [257 of 612] Compiling Assistant.Types.Pushes ( Assistant/Types/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Pushes.o ) [258 of 612] Compiling Assistant.Ssh ( Assistant/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/Ssh.o ) [259 of 612] Compiling Assistant.Alert.Utility ( Assistant/Alert/Utility.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert/Utility.o ) [260 of 612] Compiling Annex.View.ViewedFile ( Annex/View/ViewedFile.hs, dist/build/git-annex/git-annex-tmp/Annex/View/ViewedFile.o ) [261 of 612] Compiling Annex.Version ( Annex/Version.hs, dist/build/git-annex/git-annex-tmp/Annex/Version.o ) [262 of 612] Compiling Annex.VariantFile ( Annex/VariantFile.hs, dist/build/git-annex/git-annex-tmp/Annex/VariantFile.o ) [263 of 612] Compiling Annex.Url ( Annex/Url.hs, dist/build/git-annex/git-annex-tmp/Annex/Url.o ) [264 of 612] Compiling Annex.UUID ( Annex/UUID.hs, dist/build/git-annex/git-annex-tmp/Annex/UUID.o ) [265 of 612] Compiling Annex.Queue ( Annex/Queue.hs, dist/build/git-annex/git-annex-tmp/Annex/Queue.o ) [266 of 612] Compiling Annex.Perms ( Annex/Perms.hs, dist/build/git-annex/git-annex-tmp/Annex/Perms.o ) [267 of 612] Compiling Database.Init ( Database/Init.hs, dist/build/git-annex/git-annex-tmp/Database/Init.o ) [268 of 612] Compiling Creds ( Creds.hs, dist/build/git-annex/git-annex-tmp/Creds.o ) [269 of 612] Compiling Remote.Helper.AWS ( Remote/Helper/AWS.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/AWS.o ) [270 of 612] Compiling P2P.Address ( P2P/Address.hs, dist/build/git-annex/git-annex-tmp/P2P/Address.o ) [271 of 612] Compiling P2P.Auth ( P2P/Auth.hs, dist/build/git-annex/git-annex-tmp/P2P/Auth.o ) [272 of 612] Compiling Annex.Notification ( Annex/Notification.hs, dist/build/git-annex/git-annex-tmp/Annex/Notification.o ) [273 of 612] Compiling Annex.LockFile ( Annex/LockFile.hs, dist/build/git-annex/git-annex-tmp/Annex/LockFile.o ) [274 of 612] Compiling Remote.Helper.Hooks ( Remote/Helper/Hooks.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Hooks.o ) [275 of 612] Compiling Logs.File ( Logs/File.hs, dist/build/git-annex/git-annex-tmp/Logs/File.o ) [276 of 612] Compiling Logs.View ( Logs/View.hs, dist/build/git-annex/git-annex-tmp/Logs/View.o ) [277 of 612] Compiling Logs.Unused ( Logs/Unused.hs, dist/build/git-annex/git-annex-tmp/Logs/Unused.o ) [278 of 612] Compiling Logs.Transfer ( Logs/Transfer.hs, dist/build/git-annex/git-annex-tmp/Logs/Transfer.o ) [279 of 612] Compiling Annex.Transfer ( Annex/Transfer.hs, dist/build/git-annex/git-annex-tmp/Annex/Transfer.o ) [280 of 612] Compiling Logs.Smudge ( Logs/Smudge.hs, dist/build/git-annex/git-annex-tmp/Logs/Smudge.o ) [281 of 612] Compiling Logs.FsckResults ( Logs/FsckResults.hs, dist/build/git-annex/git-annex-tmp/Logs/FsckResults.o ) [282 of 612] Compiling Database.Fsck ( Database/Fsck.hs, dist/build/git-annex/git-annex-tmp/Database/Fsck.o ) [283 of 612] Compiling Annex.Tmp ( Annex/Tmp.hs, dist/build/git-annex/git-annex-tmp/Annex/Tmp.o ) [284 of 612] Compiling Annex.ReplaceFile ( Annex/ReplaceFile.hs, dist/build/git-annex/git-annex-tmp/Annex/ReplaceFile.o ) [285 of 612] Compiling Annex.Ssh ( Annex/Ssh.hs, dist/build/git-annex/git-annex-tmp/Annex/Ssh.o ) [286 of 612] Compiling Annex.Journal ( Annex/Journal.hs, dist/build/git-annex/git-annex-tmp/Annex/Journal.o ) [287 of 612] Compiling Annex.InodeSentinal ( Annex/InodeSentinal.hs, dist/build/git-annex/git-annex-tmp/Annex/InodeSentinal.o ) [288 of 612] Compiling Annex.Hook ( Annex/Hook.hs, dist/build/git-annex/git-annex-tmp/Annex/Hook.o ) [289 of 612] Compiling Upgrade.V6 ( Upgrade/V6.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V6.o ) [290 of 612] Compiling Annex.HashObject ( Annex/HashObject.hs, dist/build/git-annex/git-annex-tmp/Annex/HashObject.o ) [291 of 612] Compiling Annex.Link ( Annex/Link.hs, dist/build/git-annex/git-annex-tmp/Annex/Link.o ) [292 of 612] Compiling Annex.GitOverlay ( Annex/GitOverlay.hs, dist/build/git-annex/git-annex-tmp/Annex/GitOverlay.o ) [293 of 612] Compiling Annex.CurrentBranch ( Annex/CurrentBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/CurrentBranch.o ) [294 of 612] Compiling Annex.Content.LowLevel ( Annex/Content/LowLevel.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/LowLevel.o ) [295 of 612] Compiling Annex.Content.PointerFile ( Annex/Content/PointerFile.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/PointerFile.o ) [296 of 612] Compiling Annex.ChangedRefs ( Annex/ChangedRefs.hs, dist/build/git-annex/git-annex-tmp/Annex/ChangedRefs.o ) [297 of 612] Compiling RemoteDaemon.Types ( RemoteDaemon/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Types.o ) [298 of 612] Compiling Assistant.Types.RemoteControl ( Assistant/Types/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/RemoteControl.o ) [299 of 612] Compiling RemoteDaemon.Transport.Ssh.Types ( RemoteDaemon/Transport/Ssh/Types.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh/Types.o ) [300 of 612] Compiling P2P.Protocol ( P2P/Protocol.hs, dist/build/git-annex/git-annex-tmp/P2P/Protocol.o ) [301 of 612] Compiling P2P.IO ( P2P/IO.hs, dist/build/git-annex/git-annex-tmp/P2P/IO.o ) [302 of 612] Compiling CmdLine.GitRemoteTorAnnex ( CmdLine/GitRemoteTorAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitRemoteTorAnnex.o ) [303 of 612] Compiling Annex.CheckIgnore ( Annex/CheckIgnore.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckIgnore.o ) [304 of 612] Compiling Annex.CheckAttr ( Annex/CheckAttr.hs, dist/build/git-annex/git-annex-tmp/Annex/CheckAttr.o ) [305 of 612] Compiling Backend ( Backend.hs, dist/build/git-annex/git-annex-tmp/Backend.o ) [306 of 612] Compiling Annex.CatFile ( Annex/CatFile.hs, dist/build/git-annex/git-annex-tmp/Annex/CatFile.o ) [307 of 612] Compiling RemoteDaemon.Common ( RemoteDaemon/Common.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Common.o ) [308 of 612] Compiling Database.Keys ( Database/Keys.hs, dist/build/git-annex/git-annex-tmp/Database/Keys.o ) [309 of 612] Compiling Annex.Export ( Annex/Export.hs, dist/build/git-annex/git-annex-tmp/Annex/Export.o ) [310 of 612] Compiling Annex.BranchState ( Annex/BranchState.hs, dist/build/git-annex/git-annex-tmp/Annex/BranchState.o ) [311 of 612] Compiling Annex.Branch ( Annex/Branch.hs, dist/build/git-annex/git-annex-tmp/Annex/Branch.o ) [312 of 612] Compiling Logs.UUID ( Logs/UUID.hs, dist/build/git-annex/git-annex-tmp/Logs/UUID.o ) [313 of 612] Compiling Logs.Trust.Basic ( Logs/Trust/Basic.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust/Basic.o ) [314 of 612] Compiling Logs.SingleValue ( Logs/SingleValue.hs, dist/build/git-annex/git-annex-tmp/Logs/SingleValue.o ) [315 of 612] Compiling Logs.NumCopies ( Logs/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Logs/NumCopies.o ) [316 of 612] Compiling Logs.Schedule ( Logs/Schedule.hs, dist/build/git-annex/git-annex-tmp/Logs/Schedule.o ) [317 of 612] Compiling Logs.RemoteState ( Logs/RemoteState.hs, dist/build/git-annex/git-annex-tmp/Logs/RemoteState.o ) [318 of 612] Compiling Logs.Remote ( Logs/Remote.hs, dist/build/git-annex/git-annex-tmp/Logs/Remote.o ) [319 of 612] Compiling Logs.Presence ( Logs/Presence.hs, dist/build/git-annex/git-annex-tmp/Logs/Presence.o ) [320 of 612] Compiling Logs.PreferredContent.Raw ( Logs/PreferredContent/Raw.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent/Raw.o ) [321 of 612] Compiling Logs.Multicast ( Logs/Multicast.hs, dist/build/git-annex/git-annex-tmp/Logs/Multicast.o ) [322 of 612] Compiling Logs.MetaData ( Logs/MetaData.hs, dist/build/git-annex/git-annex-tmp/Logs/MetaData.o ) [323 of 612] Compiling Annex.MetaData ( Annex/MetaData.hs, dist/build/git-annex/git-annex-tmp/Annex/MetaData.o ) [324 of 612] Compiling Logs.Location ( Logs/Location.hs, dist/build/git-annex/git-annex-tmp/Logs/Location.o ) [325 of 612] Compiling Logs.Web ( Logs/Web.hs, dist/build/git-annex/git-annex-tmp/Logs/Web.o ) [326 of 612] Compiling Annex.Content.Direct ( Annex/Content/Direct.hs, dist/build/git-annex/git-annex-tmp/Annex/Content/Direct.o ) [327 of 612] Compiling Logs.Group ( Logs/Group.hs, dist/build/git-annex/git-annex-tmp/Logs/Group.o ) [328 of 612] Compiling Logs.Export ( Logs/Export.hs, dist/build/git-annex/git-annex-tmp/Logs/Export.o ) [329 of 612] Compiling Database.Export ( Database/Export.hs, dist/build/git-annex/git-annex-tmp/Database/Export.o ) [330 of 612] Compiling Remote.Helper.Export ( Remote/Helper/Export.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Export.o ) [331 of 612] Compiling Remote.BitTorrent ( Remote/BitTorrent.hs, dist/build/git-annex/git-annex-tmp/Remote/BitTorrent.o ) [332 of 612] Compiling Logs.Difference ( Logs/Difference.hs, dist/build/git-annex/git-annex-tmp/Logs/Difference.o ) [333 of 612] Compiling Annex.Difference ( Annex/Difference.hs, dist/build/git-annex/git-annex-tmp/Annex/Difference.o ) [334 of 612] Compiling Logs.Config ( Logs/Config.hs, dist/build/git-annex/git-annex-tmp/Logs/Config.o ) [335 of 612] Compiling Config.GitConfig ( Config/GitConfig.hs, dist/build/git-annex/git-annex-tmp/Config/GitConfig.o ) [336 of 612] Compiling Logs.Chunk ( Logs/Chunk.hs, dist/build/git-annex/git-annex-tmp/Logs/Chunk.o ) [337 of 612] Compiling Remote.Helper.Chunked ( Remote/Helper/Chunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked.o ) [338 of 612] Compiling Remote.Helper.Chunked.Legacy ( Remote/Helper/Chunked/Legacy.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Chunked/Legacy.o ) [339 of 612] Compiling Logs.Activity ( Logs/Activity.hs, dist/build/git-annex/git-annex-tmp/Logs/Activity.o ) [340 of 612] Compiling Annex.Content ( Annex/Content.hs, dist/build/git-annex/git-annex-tmp/Annex/Content.o ) [341 of 612] Compiling Upgrade.V2 ( Upgrade/V2.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V2.o ) [342 of 612] Compiling Upgrade.V1 ( Upgrade/V1.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V1.o ) [343 of 612] Compiling Upgrade.V0 ( Upgrade/V0.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V0.o ) [344 of 612] Compiling Remote.Helper.Special ( Remote/Helper/Special.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Special.o ) [345 of 612] Compiling Remote.Tahoe ( Remote/Tahoe.hs, dist/build/git-annex/git-annex-tmp/Remote/Tahoe.o ) [346 of 612] Compiling Remote.Rsync ( Remote/Rsync.hs, dist/build/git-annex/git-annex-tmp/Remote/Rsync.o ) [347 of 612] Compiling Remote.Hook ( Remote/Hook.hs, dist/build/git-annex/git-annex-tmp/Remote/Hook.o ) [348 of 612] Compiling Remote.Helper.Http ( Remote/Helper/Http.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Http.o ) [349 of 612] Compiling Remote.WebDAV ( Remote/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Remote/WebDAV.o ) [350 of 612] Compiling Remote.S3 ( Remote/S3.hs, dist/build/git-annex/git-annex-tmp/Remote/S3.o ) [351 of 612] Compiling Remote.Glacier ( Remote/Glacier.hs, dist/build/git-annex/git-annex-tmp/Remote/Glacier.o ) [352 of 612] Compiling Remote.Directory.LegacyChunked ( Remote/Directory/LegacyChunked.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory/LegacyChunked.o ) [353 of 612] Compiling Remote.Ddar ( Remote/Ddar.hs, dist/build/git-annex/git-annex-tmp/Remote/Ddar.o ) [354 of 612] Compiling Remote.Adb ( Remote/Adb.hs, dist/build/git-annex/git-annex-tmp/Remote/Adb.o ) [355 of 612] Compiling Remote.Helper.P2P ( Remote/Helper/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/P2P.o ) [356 of 612] Compiling Remote.External ( Remote/External.hs, dist/build/git-annex/git-annex-tmp/Remote/External.o ) [357 of 612] Compiling Remote.Directory ( Remote/Directory.hs, dist/build/git-annex/git-annex-tmp/Remote/Directory.o ) [358 of 612] Compiling P2P.Annex ( P2P/Annex.hs, dist/build/git-annex/git-annex-tmp/P2P/Annex.o ) [359 of 612] Compiling Remote.P2P ( Remote/P2P.hs, dist/build/git-annex/git-annex-tmp/Remote/P2P.o ) [360 of 612] Compiling Remote.Helper.Ssh ( Remote/Helper/Ssh.hs, dist/build/git-annex/git-annex-tmp/Remote/Helper/Ssh.o ) [361 of 612] Compiling RemoteDaemon.Transport.Ssh ( RemoteDaemon/Transport/Ssh.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Ssh.o ) [362 of 612] Compiling Remote.GCrypt ( Remote/GCrypt.hs, dist/build/git-annex/git-annex-tmp/Remote/GCrypt.o ) [363 of 612] Compiling RemoteDaemon.Transport.GCrypt ( RemoteDaemon/Transport/GCrypt.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/GCrypt.o ) [364 of 612] Compiling Remote.Bup ( Remote/Bup.hs, dist/build/git-annex/git-annex-tmp/Remote/Bup.o ) [365 of 612] Compiling Annex.YoutubeDl ( Annex/YoutubeDl.hs, dist/build/git-annex/git-annex-tmp/Annex/YoutubeDl.o ) [366 of 612] Compiling Remote.Web ( Remote/Web.hs, dist/build/git-annex/git-annex-tmp/Remote/Web.o ) [367 of 612] Compiling Annex.WorkTree ( Annex/WorkTree.hs, dist/build/git-annex/git-annex-tmp/Annex/WorkTree.o ) [368 of 612] Compiling Annex.Direct ( Annex/Direct.hs, dist/build/git-annex/git-annex-tmp/Annex/Direct.o ) [369 of 612] Compiling Upgrade.V4 ( Upgrade/V4.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V4.o ) [370 of 612] Compiling Upgrade.V3 ( Upgrade/V3.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V3.o ) [371 of 612] Compiling Annex.AutoMerge ( Annex/AutoMerge.hs, dist/build/git-annex/git-annex-tmp/Annex/AutoMerge.o ) [372 of 612] Compiling Annex.BloomFilter ( Annex/BloomFilter.hs, dist/build/git-annex/git-annex-tmp/Annex/BloomFilter.o ) [373 of 612] Compiling Annex.AdjustedBranch ( Annex/AdjustedBranch.hs, dist/build/git-annex/git-annex-tmp/Annex/AdjustedBranch.o ) [374 of 612] Compiling Upgrade.V5 ( Upgrade/V5.hs, dist/build/git-annex/git-annex-tmp/Upgrade/V5.o ) [375 of 612] Compiling Upgrade ( Upgrade.hs, dist/build/git-annex/git-annex-tmp/Upgrade.o ) [376 of 612] Compiling Annex.UpdateInstead ( Annex/UpdateInstead.hs, dist/build/git-annex/git-annex-tmp/Annex/UpdateInstead.o ) [377 of 612] Compiling Annex.Ingest ( Annex/Ingest.hs, dist/build/git-annex/git-annex-tmp/Annex/Ingest.o ) [378 of 612] Compiling Assistant.Types.Changes ( Assistant/Types/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/Changes.o ) [379 of 612] Compiling Annex.Action ( Annex/Action.hs, dist/build/git-annex/git-annex-tmp/Annex/Action.o ) [380 of 612] Compiling Annex.Concurrent ( Annex/Concurrent.hs, dist/build/git-annex/git-annex-tmp/Annex/Concurrent.o ) [381 of 612] Compiling RemoteDaemon.Transport.Tor ( RemoteDaemon/Transport/Tor.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport/Tor.o ) [382 of 612] Compiling RemoteDaemon.Transport ( RemoteDaemon/Transport.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Transport.o ) [383 of 612] Compiling RemoteDaemon.Core ( RemoteDaemon/Core.hs, dist/build/git-annex/git-annex-tmp/RemoteDaemon/Core.o ) [384 of 612] Compiling Assistant.Gpg ( Assistant/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/Gpg.o ) [385 of 612] Compiling Annex.Environment ( Annex/Environment.hs, dist/build/git-annex/git-annex-tmp/Annex/Environment.o ) [386 of 612] Compiling Annex.Init ( Annex/Init.hs, dist/build/git-annex/git-annex-tmp/Annex/Init.o ) [387 of 612] Compiling Remote.Git ( Remote/Git.hs, dist/build/git-annex/git-annex-tmp/Remote/Git.o ) [388 of 612] Compiling Remote.List ( Remote/List.hs, dist/build/git-annex/git-annex-tmp/Remote/List.o ) [389 of 612] Compiling Logs.Trust ( Logs/Trust.hs, dist/build/git-annex/git-annex-tmp/Logs/Trust.o ) [390 of 612] Compiling Remote ( Remote.hs, dist/build/git-annex/git-annex-tmp/Remote.o ) [391 of 612] Compiling Assistant.WebApp.RepoId ( Assistant/WebApp/RepoId.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoId.o ) [392 of 612] Compiling Annex.TaggedPush ( Annex/TaggedPush.hs, dist/build/git-annex/git-annex-tmp/Annex/TaggedPush.o ) [393 of 612] Compiling Annex.SpecialRemote ( Annex/SpecialRemote.hs, dist/build/git-annex/git-annex-tmp/Annex/SpecialRemote.o ) [394 of 612] Compiling Annex.NumCopies ( Annex/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Annex/NumCopies.o ) [395 of 612] Compiling Limit ( Limit.hs, dist/build/git-annex/git-annex-tmp/Limit.o ) [396 of 612] Compiling Annex.FileMatcher ( Annex/FileMatcher.hs, dist/build/git-annex/git-annex-tmp/Annex/FileMatcher.o ) [397 of 612] Compiling Logs.PreferredContent ( Logs/PreferredContent.hs, dist/build/git-annex/git-annex-tmp/Logs/PreferredContent.o ) [398 of 612] Compiling Annex.Wanted ( Annex/Wanted.hs, dist/build/git-annex/git-annex-tmp/Annex/Wanted.o ) [399 of 612] Compiling Limit.Wanted ( Limit/Wanted.hs, dist/build/git-annex/git-annex-tmp/Limit/Wanted.o ) [400 of 612] Compiling CmdLine.GitAnnex.Options ( CmdLine/GitAnnex/Options.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex/Options.o ) [401 of 612] Compiling CmdLine.Seek ( CmdLine/Seek.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Seek.o ) [402 of 612] Compiling CmdLine.Action ( CmdLine/Action.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Action.o ) [403 of 612] Compiling CmdLine.Batch ( CmdLine/Batch.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Batch.o ) [404 of 612] Compiling Annex.View ( Annex/View.hs, dist/build/git-annex/git-annex-tmp/Annex/View.o ) [405 of 612] Compiling Command ( Command.hs, dist/build/git-annex/git-annex-tmp/Command.o ) [406 of 612] Compiling Command.Whereis ( Command/Whereis.hs, dist/build/git-annex/git-annex-tmp/Command/Whereis.o ) [407 of 612] Compiling Command.Wanted ( Command/Wanted.hs, dist/build/git-annex/git-annex-tmp/Command/Wanted.o ) [408 of 612] Compiling Command.View ( Command/View.hs, dist/build/git-annex/git-annex-tmp/Command/View.o ) [409 of 612] Compiling Command.Vicfg ( Command/Vicfg.hs, dist/build/git-annex/git-annex-tmp/Command/Vicfg.o ) [410 of 612] Compiling Command.Version ( Command/Version.hs, dist/build/git-annex/git-annex-tmp/Command/Version.o ) [411 of 612] Compiling Command.VPop ( Command/VPop.hs, dist/build/git-annex/git-annex-tmp/Command/VPop.o ) [412 of 612] Compiling Command.VFilter ( Command/VFilter.hs, dist/build/git-annex/git-annex-tmp/Command/VFilter.o ) [413 of 612] Compiling Command.VCycle ( Command/VCycle.hs, dist/build/git-annex/git-annex-tmp/Command/VCycle.o ) [414 of 612] Compiling Command.VAdd ( Command/VAdd.hs, dist/build/git-annex/git-annex-tmp/Command/VAdd.o ) [415 of 612] Compiling Command.Upgrade ( Command/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Command/Upgrade.o ) [416 of 612] Compiling Command.Unused ( Command/Unused.hs, dist/build/git-annex/git-annex-tmp/Command/Unused.o ) [417 of 612] Compiling Command.Unlock ( Command/Unlock.hs, dist/build/git-annex/git-annex-tmp/Command/Unlock.o ) [418 of 612] Compiling Command.Ungroup ( Command/Ungroup.hs, dist/build/git-annex/git-annex-tmp/Command/Ungroup.o ) [419 of 612] Compiling Command.Trust ( Command/Trust.hs, dist/build/git-annex/git-annex-tmp/Command/Trust.o ) [420 of 612] Compiling Command.Untrust ( Command/Untrust.hs, dist/build/git-annex/git-annex-tmp/Command/Untrust.o ) [421 of 612] Compiling Command.TransferKeys ( Command/TransferKeys.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKeys.o ) [422 of 612] Compiling Command.TransferKey ( Command/TransferKey.hs, dist/build/git-annex/git-annex-tmp/Command/TransferKey.o ) [423 of 612] Compiling Command.TransferInfo ( Command/TransferInfo.hs, dist/build/git-annex/git-annex-tmp/Command/TransferInfo.o ) [424 of 612] Compiling Command.TestRemote ( Command/TestRemote.hs, dist/build/git-annex/git-annex-tmp/Command/TestRemote.o ) [425 of 612] Compiling Command.Test ( Command/Test.hs, dist/build/git-annex/git-annex-tmp/Command/Test.o ) [426 of 612] Compiling Command.Status ( Command/Status.hs, dist/build/git-annex/git-annex-tmp/Command/Status.o ) [427 of 612] Compiling Command.Smudge ( Command/Smudge.hs, dist/build/git-annex/git-annex-tmp/Command/Smudge.o ) [428 of 612] Compiling Command.SetPresentKey ( Command/SetPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetPresentKey.o ) [429 of 612] Compiling Command.SetKey ( Command/SetKey.hs, dist/build/git-annex/git-annex-tmp/Command/SetKey.o ) [430 of 612] Compiling Command.SendKey ( Command/SendKey.hs, dist/build/git-annex/git-annex-tmp/Command/SendKey.o ) [431 of 612] Compiling Command.Semitrust ( Command/Semitrust.hs, dist/build/git-annex/git-annex-tmp/Command/Semitrust.o ) [432 of 612] Compiling Command.Schedule ( Command/Schedule.hs, dist/build/git-annex/git-annex-tmp/Command/Schedule.o ) [433 of 612] Compiling Command.RmUrl ( Command/RmUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RmUrl.o ) [434 of 612] Compiling Command.ResolveMerge ( Command/ResolveMerge.hs, dist/build/git-annex/git-annex-tmp/Command/ResolveMerge.o ) [435 of 612] Compiling Command.Required ( Command/Required.hs, dist/build/git-annex/git-annex-tmp/Command/Required.o ) [436 of 612] Compiling Command.Repair ( Command/Repair.hs, dist/build/git-annex/git-annex-tmp/Command/Repair.o ) [437 of 612] Compiling Command.RemoteDaemon ( Command/RemoteDaemon.hs, dist/build/git-annex/git-annex-tmp/Command/RemoteDaemon.o ) [438 of 612] Compiling Command.Reinject ( Command/Reinject.hs, dist/build/git-annex/git-annex-tmp/Command/Reinject.o ) [439 of 612] Compiling Command.Reinit ( Command/Reinit.hs, dist/build/git-annex/git-annex-tmp/Command/Reinit.o ) [440 of 612] Compiling Command.RecvKey ( Command/RecvKey.hs, dist/build/git-annex/git-annex-tmp/Command/RecvKey.o ) [441 of 612] Compiling Command.ReadPresentKey ( Command/ReadPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReadPresentKey.o ) [442 of 612] Compiling Command.ReKey ( Command/ReKey.hs, dist/build/git-annex/git-annex-tmp/Command/ReKey.o ) [443 of 612] Compiling Command.Proxy ( Command/Proxy.hs, dist/build/git-annex/git-annex-tmp/Command/Proxy.o ) [444 of 612] Compiling Command.P2P ( Command/P2P.hs, dist/build/git-annex/git-annex-tmp/Command/P2P.o ) [445 of 612] Compiling Command.NumCopies ( Command/NumCopies.hs, dist/build/git-annex/git-annex-tmp/Command/NumCopies.o ) [446 of 612] Compiling Command.NotifyChanges ( Command/NotifyChanges.hs, dist/build/git-annex/git-annex-tmp/Command/NotifyChanges.o ) [447 of 612] Compiling Command.Multicast ( Command/Multicast.hs, dist/build/git-annex/git-annex-tmp/Command/Multicast.o ) [448 of 612] Compiling Command.MetaData ( Command/MetaData.hs, dist/build/git-annex/git-annex-tmp/Command/MetaData.o ) [449 of 612] Compiling Command.MatchExpression ( Command/MatchExpression.hs, dist/build/git-annex/git-annex-tmp/Command/MatchExpression.o ) [450 of 612] Compiling Command.Map ( Command/Map.hs, dist/build/git-annex/git-annex-tmp/Command/Map.o ) [451 of 612] Compiling Command.LookupKey ( Command/LookupKey.hs, dist/build/git-annex/git-annex-tmp/Command/LookupKey.o ) [452 of 612] Compiling Command.Log ( Command/Log.hs, dist/build/git-annex/git-annex-tmp/Command/Log.o ) [453 of 612] Compiling Command.LockContent ( Command/LockContent.hs, dist/build/git-annex/git-annex-tmp/Command/LockContent.o ) [454 of 612] Compiling Command.Lock ( Command/Lock.hs, dist/build/git-annex/git-annex-tmp/Command/Lock.o ) [455 of 612] Compiling Command.List ( Command/List.hs, dist/build/git-annex/git-annex-tmp/Command/List.o ) [456 of 612] Compiling Command.Inprogress ( Command/Inprogress.hs, dist/build/git-annex/git-annex-tmp/Command/Inprogress.o ) [457 of 612] Compiling Command.InitRemote ( Command/InitRemote.hs, dist/build/git-annex/git-annex-tmp/Command/InitRemote.o ) [458 of 612] Compiling Command.Init ( Command/Init.hs, dist/build/git-annex/git-annex-tmp/Command/Init.o ) [459 of 612] Compiling Command.Info ( Command/Info.hs, dist/build/git-annex/git-annex-tmp/Command/Info.o ) [460 of 612] Compiling Command.Indirect ( Command/Indirect.hs, dist/build/git-annex/git-annex-tmp/Command/Indirect.o ) [461 of 612] Compiling Command.InAnnex ( Command/InAnnex.hs, dist/build/git-annex/git-annex-tmp/Command/InAnnex.o ) [462 of 612] Compiling Command.GroupWanted ( Command/GroupWanted.hs, dist/build/git-annex/git-annex-tmp/Command/GroupWanted.o ) [463 of 612] Compiling Command.Group ( Command/Group.hs, dist/build/git-annex/git-annex-tmp/Command/Group.o ) [464 of 612] Compiling Command.GCryptSetup ( Command/GCryptSetup.hs, dist/build/git-annex/git-annex-tmp/Command/GCryptSetup.o ) [465 of 612] Compiling Command.FuzzTest ( Command/FuzzTest.hs, dist/build/git-annex/git-annex-tmp/Command/FuzzTest.o ) [466 of 612] Compiling Command.Fsck ( Command/Fsck.hs, dist/build/git-annex/git-annex-tmp/Command/Fsck.o ) [467 of 612] Compiling Command.Migrate ( Command/Migrate.hs, dist/build/git-annex/git-annex-tmp/Command/Migrate.o ) [468 of 612] Compiling Command.FromKey ( Command/FromKey.hs, dist/build/git-annex/git-annex-tmp/Command/FromKey.o ) [469 of 612] Compiling Command.RegisterUrl ( Command/RegisterUrl.hs, dist/build/git-annex/git-annex-tmp/Command/RegisterUrl.o ) [470 of 612] Compiling Command.Forget ( Command/Forget.hs, dist/build/git-annex/git-annex-tmp/Command/Forget.o ) [471 of 612] Compiling Command.Fix ( Command/Fix.hs, dist/build/git-annex/git-annex-tmp/Command/Fix.o ) [472 of 612] Compiling Command.Find ( Command/Find.hs, dist/build/git-annex/git-annex-tmp/Command/Find.o ) [473 of 612] Compiling Command.FindRef ( Command/FindRef.hs, dist/build/git-annex/git-annex-tmp/Command/FindRef.o ) [474 of 612] Compiling Command.Export ( Command/Export.hs, dist/build/git-annex/git-annex-tmp/Command/Export.o ) [475 of 612] Compiling Command.Expire ( Command/Expire.hs, dist/build/git-annex/git-annex-tmp/Command/Expire.o ) [476 of 612] Compiling Command.ExamineKey ( Command/ExamineKey.hs, dist/build/git-annex/git-annex-tmp/Command/ExamineKey.o ) [477 of 612] Compiling Command.EnableTor ( Command/EnableTor.hs, dist/build/git-annex/git-annex-tmp/Command/EnableTor.o ) [478 of 612] Compiling Command.EnableRemote ( Command/EnableRemote.hs, dist/build/git-annex/git-annex-tmp/Command/EnableRemote.o ) [479 of 612] Compiling Command.DropKey ( Command/DropKey.hs, dist/build/git-annex/git-annex-tmp/Command/DropKey.o ) [480 of 612] Compiling Command.Drop ( Command/Drop.hs, dist/build/git-annex/git-annex-tmp/Command/Drop.o ) [481 of 612] Compiling Command.Move ( Command/Move.hs, dist/build/git-annex/git-annex-tmp/Command/Move.o ) [482 of 612] Compiling Command.Get ( Command/Get.hs, dist/build/git-annex/git-annex-tmp/Command/Get.o ) [483 of 612] Compiling Command.Mirror ( Command/Mirror.hs, dist/build/git-annex/git-annex-tmp/Command/Mirror.o ) [484 of 612] Compiling Command.DropUnused ( Command/DropUnused.hs, dist/build/git-annex/git-annex-tmp/Command/DropUnused.o ) [485 of 612] Compiling Command.Direct ( Command/Direct.hs, dist/build/git-annex/git-annex-tmp/Command/Direct.o ) [486 of 612] Compiling Command.DiffDriver ( Command/DiffDriver.hs, dist/build/git-annex/git-annex-tmp/Command/DiffDriver.o ) [487 of 612] Compiling Command.Describe ( Command/Describe.hs, dist/build/git-annex/git-annex-tmp/Command/Describe.o ) [488 of 612] Compiling Command.Dead ( Command/Dead.hs, dist/build/git-annex/git-annex-tmp/Command/Dead.o ) [489 of 612] Compiling Command.Copy ( Command/Copy.hs, dist/build/git-annex/git-annex-tmp/Command/Copy.o ) [490 of 612] Compiling Command.ContentLocation ( Command/ContentLocation.hs, dist/build/git-annex/git-annex-tmp/Command/ContentLocation.o ) [491 of 612] Compiling Command.Config ( Command/Config.hs, dist/build/git-annex/git-annex-tmp/Command/Config.o ) [492 of 612] Compiling Command.Commit ( Command/Commit.hs, dist/build/git-annex/git-annex-tmp/Command/Commit.o ) [493 of 612] Compiling Command.CheckPresentKey ( Command/CheckPresentKey.hs, dist/build/git-annex/git-annex-tmp/Command/CheckPresentKey.o ) [494 of 612] Compiling Command.CalcKey ( Command/CalcKey.hs, dist/build/git-annex/git-annex-tmp/Command/CalcKey.o ) [495 of 612] Compiling Command.Benchmark ( Command/Benchmark.hs, dist/build/git-annex/git-annex-tmp/Command/Benchmark.o ) [496 of 612] Compiling Command.Adjust ( Command/Adjust.hs, dist/build/git-annex/git-annex-tmp/Command/Adjust.o ) [497 of 612] Compiling Command.AddUnused ( Command/AddUnused.hs, dist/build/git-annex/git-annex-tmp/Command/AddUnused.o ) [498 of 612] Compiling Command.Add ( Command/Add.hs, dist/build/git-annex/git-annex-tmp/Command/Add.o ) [499 of 612] Compiling Command.PreCommit ( Command/PreCommit.hs, dist/build/git-annex/git-annex-tmp/Command/PreCommit.o ) [500 of 612] Compiling Command.Unannex ( Command/Unannex.hs, dist/build/git-annex/git-annex-tmp/Command/Unannex.o ) [501 of 612] Compiling Command.Uninit ( Command/Uninit.hs, dist/build/git-annex/git-annex-tmp/Command/Uninit.o ) [502 of 612] Compiling Command.Import ( Command/Import.hs, dist/build/git-annex/git-annex-tmp/Command/Import.o ) [503 of 612] Compiling Command.AddUrl ( Command/AddUrl.hs, dist/build/git-annex/git-annex-tmp/Command/AddUrl.o ) [504 of 612] Compiling Command.ImportFeed ( Command/ImportFeed.hs, dist/build/git-annex/git-annex-tmp/Command/ImportFeed.o ) [505 of 612] Compiling CmdLine ( CmdLine.hs, dist/build/git-annex/git-annex-tmp/CmdLine.o ) [506 of 612] Compiling Benchmark ( Benchmark.hs, dist/build/git-annex/git-annex-tmp/Benchmark.o ) [507 of 612] Compiling Annex.Drop ( Annex/Drop.hs, dist/build/git-annex/git-annex-tmp/Annex/Drop.o ) [508 of 612] Compiling Command.Sync ( Command/Sync.hs, dist/build/git-annex/git-annex-tmp/Command/Sync.o ) [509 of 612] Compiling Command.Undo ( Command/Undo.hs, dist/build/git-annex/git-annex-tmp/Command/Undo.o ) [510 of 612] Compiling Command.PostReceive ( Command/PostReceive.hs, dist/build/git-annex/git-annex-tmp/Command/PostReceive.o ) [511 of 612] Compiling Command.Merge ( Command/Merge.hs, dist/build/git-annex/git-annex-tmp/Command/Merge.o ) [512 of 612] Compiling Command.Help ( Command/Help.hs, dist/build/git-annex/git-annex-tmp/Command/Help.o ) [513 of 612] Compiling CmdLine.GitAnnexShell.Checks ( CmdLine/GitAnnexShell/Checks.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell/Checks.o ) [514 of 612] Compiling Command.P2PStdIO ( Command/P2PStdIO.hs, dist/build/git-annex/git-annex-tmp/Command/P2PStdIO.o ) [515 of 612] Compiling Command.ConfigList ( Command/ConfigList.hs, dist/build/git-annex/git-annex-tmp/Command/ConfigList.o ) [516 of 612] Compiling CmdLine.GitAnnexShell ( CmdLine/GitAnnexShell.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnexShell.o ) [517 of 612] Compiling Utility.Verifiable ( Utility/Verifiable.hs, dist/build/git-annex/git-annex-tmp/Utility/Verifiable.o ) [518 of 612] Compiling Assistant.Pairing ( Assistant/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing.o ) [519 of 612] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o ) [520 of 612] Compiling Assistant.Types.TransferrerPool ( Assistant/Types/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/TransferrerPool.o ) [521 of 612] Compiling Assistant.Monad ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o ) [522 of 612] Compiling Assistant.Types.NamedThread ( Assistant/Types/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/NamedThread.o ) [523 of 612] Compiling Assistant.Common ( Assistant/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/Common.o ) [524 of 612] Compiling Assistant.WebApp.Pairing ( Assistant/WebApp/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Pairing.o ) [525 of 612] Compiling Assistant.Unused ( Assistant/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/Unused.o ) [526 of 612] Compiling Assistant.TransferrerPool ( Assistant/TransferrerPool.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferrerPool.o ) [527 of 612] Compiling Assistant.ScanRemotes ( Assistant/ScanRemotes.hs, dist/build/git-annex/git-annex-tmp/Assistant/ScanRemotes.o ) [528 of 612] Compiling Assistant.RepoProblem ( Assistant/RepoProblem.hs, dist/build/git-annex/git-annex-tmp/Assistant/RepoProblem.o ) [529 of 612] Compiling Assistant.RemoteControl ( Assistant/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/RemoteControl.o ) [530 of 612] Compiling Assistant.Pushes ( Assistant/Pushes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pushes.o ) [531 of 612] Compiling Assistant.MakeRemote ( Assistant/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/MakeRemote.o ) [532 of 612] Compiling Assistant.Install ( Assistant/Install.hs, dist/build/git-annex/git-annex-tmp/Assistant/Install.o ) [533 of 612] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/DaemonStatus.o ) [534 of 612] Compiling Assistant.TransferQueue ( Assistant/TransferQueue.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferQueue.o ) [535 of 612] Compiling Assistant.Threads.Glacier ( Assistant/Threads/Glacier.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Glacier.o ) [536 of 612] Compiling Assistant.Threads.DaemonStatus ( Assistant/Threads/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/DaemonStatus.o ) [537 of 612] Compiling Assistant.Drop ( Assistant/Drop.hs, dist/build/git-annex/git-annex-tmp/Assistant/Drop.o ) [538 of 612] Compiling Assistant.CredPairCache ( Assistant/CredPairCache.hs, dist/build/git-annex/git-annex-tmp/Assistant/CredPairCache.o ) [539 of 612] Compiling Assistant.Commits ( Assistant/Commits.hs, dist/build/git-annex/git-annex-tmp/Assistant/Commits.o ) [540 of 612] Compiling Assistant.Threads.Exporter ( Assistant/Threads/Exporter.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Exporter.o ) [541 of 612] Compiling Assistant.Changes ( Assistant/Changes.hs, dist/build/git-annex/git-annex-tmp/Assistant/Changes.o ) [542 of 612] Compiling Assistant.BranchChange ( Assistant/BranchChange.hs, dist/build/git-annex/git-annex-tmp/Assistant/BranchChange.o ) [543 of 612] Compiling Assistant.Threads.ConfigMonitor ( Assistant/Threads/ConfigMonitor.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ConfigMonitor.o ) [544 of 612] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o ) [545 of 612] Compiling Utility.WebApp ( Utility/WebApp.hs, dist/build/git-annex/git-annex-tmp/Utility/WebApp.o ) [546 of 612] Compiling Utility.Yesod ( Utility/Yesod.hs, dist/build/git-annex/git-annex-tmp/Utility/Yesod.o ) [547 of 612] Compiling Assistant.WebApp.Types ( Assistant/WebApp/Types.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Types.o ) [548 of 612] Compiling Assistant.WebApp.Form ( Assistant/WebApp/Form.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Form.o ) [549 of 612] Compiling Assistant.WebApp ( Assistant/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp.o ) [550 of 612] Compiling Assistant.WebApp.Notifications ( Assistant/WebApp/Notifications.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Notifications.o ) [551 of 612] Compiling Assistant.WebApp.SideBar ( Assistant/WebApp/SideBar.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/SideBar.o ) [552 of 612] Compiling Assistant.WebApp.Page ( Assistant/WebApp/Page.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Page.o ) [553 of 612] Compiling Assistant.WebApp.Common ( Assistant/WebApp/Common.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Common.o ) [554 of 612] Compiling Assistant.WebApp.Documentation ( Assistant/WebApp/Documentation.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Documentation.o ) [555 of 612] Compiling Assistant.WebApp.Configurators.Unused ( Assistant/WebApp/Configurators/Unused.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Unused.o ) [556 of 612] Compiling Assistant.WebApp.Configurators.Preferences ( Assistant/WebApp/Configurators/Preferences.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Preferences.o ) [557 of 612] Compiling Annex.MakeRepo ( Annex/MakeRepo.hs, dist/build/git-annex/git-annex-tmp/Annex/MakeRepo.o ) [558 of 612] Compiling Assistant.Types.UrlRenderer ( Assistant/Types/UrlRenderer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/UrlRenderer.o ) [559 of 612] Compiling Assistant.Alert ( Assistant/Alert.hs, dist/build/git-annex/git-annex-tmp/Assistant/Alert.o ) [560 of 612] Compiling Assistant.TransferSlots ( Assistant/TransferSlots.hs, dist/build/git-annex/git-annex-tmp/Assistant/TransferSlots.o ) [561 of 612] Compiling Assistant.Threads.Transferrer ( Assistant/Threads/Transferrer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Transferrer.o ) [562 of 612] Compiling Assistant.Threads.TransferWatcher ( Assistant/Threads/TransferWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferWatcher.o ) [563 of 612] Compiling Assistant.Threads.TransferPoller ( Assistant/Threads/TransferPoller.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferPoller.o ) [564 of 612] Compiling Assistant.Threads.Watcher ( Assistant/Threads/Watcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Watcher.o ) [565 of 612] Compiling Assistant.Threads.RemoteControl ( Assistant/Threads/RemoteControl.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/RemoteControl.o ) [566 of 612] Compiling Assistant.Threads.Committer ( Assistant/Threads/Committer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Committer.o ) [567 of 612] Compiling Assistant.NamedThread ( Assistant/NamedThread.hs, dist/build/git-annex/git-annex-tmp/Assistant/NamedThread.o ) [568 of 612] Compiling Assistant.Sync ( Assistant/Sync.hs, dist/build/git-annex/git-annex-tmp/Assistant/Sync.o ) [569 of 612] Compiling Assistant.WebApp.RepoList ( Assistant/WebApp/RepoList.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/RepoList.o ) [570 of 612] Compiling Assistant.WebApp.DashBoard ( Assistant/WebApp/DashBoard.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/DashBoard.o ) [571 of 612] Compiling Assistant.WebApp.Configurators ( Assistant/WebApp/Configurators.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators.o ) [572 of 612] Compiling Assistant.WebApp.MakeRemote ( Assistant/WebApp/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/MakeRemote.o ) [573 of 612] Compiling Assistant.WebApp.Gpg ( Assistant/WebApp/Gpg.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Gpg.o ) [574 of 612] Compiling Assistant.WebApp.Configurators.WebDAV ( Assistant/WebApp/Configurators/WebDAV.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/WebDAV.o ) [575 of 612] Compiling Assistant.WebApp.Configurators.Ssh ( Assistant/WebApp/Configurators/Ssh.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Ssh.o ) [576 of 612] Compiling Assistant.WebApp.Configurators.AWS ( Assistant/WebApp/Configurators/AWS.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/AWS.o ) [577 of 612] Compiling Assistant.WebApp.Configurators.IA ( Assistant/WebApp/Configurators/IA.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/IA.o ) [578 of 612] Compiling Assistant.WebApp.Configurators.Edit ( Assistant/WebApp/Configurators/Edit.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Edit.o ) [579 of 612] Compiling Assistant.Threads.Pusher ( Assistant/Threads/Pusher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Pusher.o ) [580 of 612] Compiling Assistant.Threads.NetWatcher ( Assistant/Threads/NetWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/NetWatcher.o ) [581 of 612] Compiling Assistant.Threads.Merger ( Assistant/Threads/Merger.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Merger.o ) [582 of 612] Compiling Assistant.Repair ( Assistant/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/Repair.o ) [583 of 612] Compiling Assistant.WebApp.Repair ( Assistant/WebApp/Repair.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Repair.o ) [584 of 612] Compiling Assistant.Threads.ProblemFixer ( Assistant/Threads/ProblemFixer.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/ProblemFixer.o ) [585 of 612] Compiling Assistant.Pairing.MakeRemote ( Assistant/Pairing/MakeRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/MakeRemote.o ) [586 of 612] Compiling Assistant.WebApp.Configurators.Pairing ( Assistant/WebApp/Configurators/Pairing.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Pairing.o ) [587 of 612] Compiling Assistant.Threads.PairListener ( Assistant/Threads/PairListener.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/PairListener.o ) [588 of 612] Compiling Assistant.Restart ( Assistant/Restart.hs, dist/build/git-annex/git-annex-tmp/Assistant/Restart.o ) [589 of 612] Compiling Assistant.WebApp.OtherRepos ( Assistant/WebApp/OtherRepos.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/OtherRepos.o ) [590 of 612] Compiling Assistant.WebApp.Control ( Assistant/WebApp/Control.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Control.o ) [591 of 612] Compiling Assistant.WebApp.Configurators.Local ( Assistant/WebApp/Configurators/Local.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Local.o ) [592 of 612] Compiling Assistant.Upgrade ( Assistant/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/Upgrade.o ) [593 of 612] Compiling Assistant.WebApp.Configurators.Upgrade ( Assistant/WebApp/Configurators/Upgrade.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Upgrade.o ) [594 of 612] Compiling Assistant.Threads.Upgrader ( Assistant/Threads/Upgrader.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Upgrader.o ) [595 of 612] Compiling Assistant.Threads.UpgradeWatcher ( Assistant/Threads/UpgradeWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/UpgradeWatcher.o ) [596 of 612] Compiling Assistant.Threads.SanityChecker ( Assistant/Threads/SanityChecker.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/SanityChecker.o ) [597 of 612] Compiling Assistant.Fsck ( Assistant/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/Fsck.o ) [598 of 612] Compiling Assistant.WebApp.Configurators.Fsck ( Assistant/WebApp/Configurators/Fsck.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Fsck.o ) [599 of 612] Compiling Assistant.Threads.MountWatcher ( Assistant/Threads/MountWatcher.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/MountWatcher.o ) [600 of 612] Compiling Assistant.Threads.Cronner ( Assistant/Threads/Cronner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/Cronner.o ) [601 of 612] Compiling Assistant.DeleteRemote ( Assistant/DeleteRemote.hs, dist/build/git-annex/git-annex-tmp/Assistant/DeleteRemote.o ) [602 of 612] Compiling Assistant.WebApp.Configurators.Delete ( Assistant/WebApp/Configurators/Delete.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Delete.o ) [603 of 612] Compiling Assistant.Threads.WebApp ( Assistant/Threads/WebApp.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/WebApp.o ) [604 of 612] Compiling Assistant.Threads.TransferScanner ( Assistant/Threads/TransferScanner.hs, dist/build/git-annex/git-annex-tmp/Assistant/Threads/TransferScanner.o ) [605 of 612] Compiling Assistant ( Assistant.hs, dist/build/git-annex/git-annex-tmp/Assistant.o ) [606 of 612] Compiling Command.WebApp ( Command/WebApp.hs, dist/build/git-annex/git-annex-tmp/Command/WebApp.o ) [607 of 612] Compiling Command.Watch ( Command/Watch.hs, dist/build/git-annex/git-annex-tmp/Command/Watch.o ) [608 of 612] Compiling Command.Assistant ( Command/Assistant.hs, dist/build/git-annex/git-annex-tmp/Command/Assistant.o ) [609 of 612] Compiling CmdLine.GitAnnex ( CmdLine/GitAnnex.hs, dist/build/git-annex/git-annex-tmp/CmdLine/GitAnnex.o ) [610 of 612] Compiling Test.Framework ( Test/Framework.hs, dist/build/git-annex/git-annex-tmp/Test/Framework.o ) [611 of 612] Compiling Test ( Test.hs, dist/build/git-annex/git-annex-tmp/Test.o ) [612 of 612] Compiling Main ( git-annex.hs, dist/build/git-annex/git-annex-tmp/Main.o ) Linking dist/build/git-annex/git-annex ... + LC_ALL=C + TZ=UTC + ikiwiki doc html -v --wikiname git-annex --plugin=goodstuff --no-usedirs --disable-plugin=openid --plugin=sidebar --underlaydir=/dev/null --set deterministic=1 --disable-plugin=shortcut --disable-plugin=smiley --plugin=comments --set 'comments_pagespec=*' '--exclude=news/.*' '--exclude=design/assistant/blog/*' '--exclude=bugs/*' '--exclude=todo/*' '--exclude=forum/*' '--exclude=users/*' '--exclude=devblog/*' --exclude=thanks refreshing wiki.. scanning git-annex-multicast.mdwn scanning git-annex-unlock.mdwn scanning git-annex-vicfg.mdwn scanning git-annex-merge.mdwn scanning git-annex-info.mdwn scanning git-annex-direct.mdwn scanning git-annex-diffdriver.mdwn scanning git-annex-list.mdwn scanning git-annex-unannex.mdwn scanning git-annex-undo.mdwn scanning git-annex-export.mdwn scanning git-annex-remotedaemon.mdwn scanning git-annex-reinject.mdwn scanning git-annex-pre-commit.mdwn scanning git-annex-setpresentkey.mdwn scanning git-annex-dead.mdwn scanning git-annex-enable-tor.mdwn scanning git-annex-fix.mdwn scanning git-annex-fuzztest.mdwn scanning git-annex-dropunused.mdwn scanning git-annex-ungroup.mdwn scanning git-annex-find.mdwn scanning git-annex.mdwn scanning git-annex-repair.mdwn scanning git-annex-proxy.mdwn scanning git-annex-setkey.mdwn scanning git-annex-version.mdwn scanning git-annex-fsck.mdwn scanning git-annex-schedule.mdwn scanning git-annex-log.mdwn scanning git-annex-import.mdwn scanning git-annex-uninit.mdwn scanning git-annex-wanted.mdwn scanning git-annex-map.mdwn scanning git-annex-vpop.mdwn scanning git-annex-group.mdwn scanning git-annex-lookupkey.mdwn scanning git-annex-edit.mdwn scanning git-annex-semitrust.mdwn scanning git-annex-examinekey.mdwn scanning git-annex-add.mdwn scanning git-annex-numcopies.mdwn scanning git-annex-findref.mdwn scanning git-annex-calckey.mdwn scanning git-annex-status.mdwn scanning git-annex-mirror.mdwn scanning git-annex-get.mdwn scanning git-annex-indirect.mdwn scanning git-annex-p2p.mdwn scanning logo_16x16.png scanning git-annex-checkpresentkey.mdwn scanning git-annex-shell.mdwn scanning git-annex-resolvemerge.mdwn scanning git-annex-required.mdwn scanning git-annex-addurl.mdwn scanning git-annex-matchexpression.mdwn scanning git-remote-tor-annex.mdwn scanning logo.svg scanning git-annex-init.mdwn scanning git-annex-vadd.mdwn scanning git-annex-enableremote.mdwn scanning git-annex-migrate.mdwn scanning git-annex-testremote.mdwn scanning git-annex-test.mdwn scanning git-annex-view.mdwn scanning git-annex-unused.mdwn scanning git-annex-registerurl.mdwn scanning git-annex-rmurl.mdwn scanning git-annex-metadata.mdwn scanning git-annex-move.mdwn scanning git-annex-lock.mdwn scanning git-annex-describe.mdwn scanning git-annex-drop.mdwn scanning git-annex-sync.mdwn scanning git-annex-untrust.mdwn scanning git-annex-inprogress.mdwn scanning git-annex-fromkey.mdwn scanning git-annex-addunused.mdwn scanning git-annex-transferkeys.mdwn scanning git-annex-copy.mdwn scanning git-annex-expire.mdwn scanning git-annex-contentlocation.mdwn scanning git-annex-trust.mdwn scanning git-annex-upgrade.mdwn scanning git-annex-readpresentkey.mdwn scanning git-annex-vfilter.mdwn scanning git-annex-matching-options.mdwn scanning git-annex-vcycle.mdwn scanning git-annex-transferkey.mdwn scanning git-annex-webapp.mdwn scanning git-annex-dropkey.mdwn scanning git-annex-groupwanted.mdwn scanning git-annex-preferred-content.mdwn scanning git-annex-initremote.mdwn scanning git-annex-smudge.mdwn scanning git-annex-assistant.mdwn scanning git-annex-reinit.mdwn scanning git-annex-forget.mdwn scanning git-annex-adjust.mdwn scanning git-annex-importfeed.mdwn scanning git-annex-whereis.mdwn scanning git-annex-watch.mdwn scanning git-annex-rekey.mdwn scanning index.mdwn scanning license/GPL scanning license/AGPL scanning ikiwiki/ikiwiki.js scanning ikiwiki/relativedate.js scanning ikiwiki/toggle.js building git-annex-multicast.mdwn building git-annex-unlock.mdwn building git-annex-vicfg.mdwn building git-annex-merge.mdwn building git-annex-info.mdwn building git-annex-direct.mdwn building git-annex-diffdriver.mdwn building git-annex-list.mdwn building git-annex-unannex.mdwn building git-annex-undo.mdwn building git-annex-export.mdwn building git-annex-remotedaemon.mdwn building git-annex-reinject.mdwn building git-annex-pre-commit.mdwn building git-annex-setpresentkey.mdwn building git-annex-dead.mdwn building git-annex-enable-tor.mdwn building git-annex-fix.mdwn building git-annex-fuzztest.mdwn building git-annex-dropunused.mdwn building git-annex-ungroup.mdwn building git-annex-find.mdwn building git-annex.mdwn building git-annex-repair.mdwn building git-annex-proxy.mdwn building git-annex-setkey.mdwn building git-annex-version.mdwn building git-annex-fsck.mdwn building git-annex-schedule.mdwn building git-annex-log.mdwn building git-annex-import.mdwn building git-annex-uninit.mdwn building git-annex-wanted.mdwn building git-annex-map.mdwn building git-annex-vpop.mdwn building git-annex-group.mdwn building git-annex-lookupkey.mdwn building git-annex-edit.mdwn building git-annex-semitrust.mdwn building git-annex-examinekey.mdwn building git-annex-add.mdwn building git-annex-numcopies.mdwn building git-annex-findref.mdwn building git-annex-calckey.mdwn building git-annex-status.mdwn building git-annex-mirror.mdwn building git-annex-get.mdwn building git-annex-indirect.mdwn building git-annex-p2p.mdwn building logo_16x16.png building git-annex-checkpresentkey.mdwn building git-annex-shell.mdwn building git-annex-resolvemerge.mdwn building git-annex-required.mdwn building git-annex-addurl.mdwn building git-annex-matchexpression.mdwn building git-remote-tor-annex.mdwn building logo.svg building git-annex-init.mdwn building git-annex-vadd.mdwn building git-annex-enableremote.mdwn building git-annex-migrate.mdwn building git-annex-testremote.mdwn building git-annex-test.mdwn building git-annex-view.mdwn building git-annex-unused.mdwn building git-annex-registerurl.mdwn building git-annex-rmurl.mdwn building git-annex-metadata.mdwn building git-annex-move.mdwn building git-annex-lock.mdwn building git-annex-describe.mdwn building git-annex-drop.mdwn building git-annex-sync.mdwn building git-annex-untrust.mdwn building git-annex-inprogress.mdwn building git-annex-fromkey.mdwn building git-annex-addunused.mdwn building git-annex-transferkeys.mdwn building git-annex-copy.mdwn building git-annex-expire.mdwn building git-annex-contentlocation.mdwn building git-annex-trust.mdwn building git-annex-upgrade.mdwn building git-annex-readpresentkey.mdwn building git-annex-vfilter.mdwn building git-annex-matching-options.mdwn building git-annex-vcycle.mdwn building git-annex-transferkey.mdwn building git-annex-webapp.mdwn building git-annex-dropkey.mdwn building git-annex-groupwanted.mdwn building git-annex-preferred-content.mdwn building git-annex-initremote.mdwn building git-annex-smudge.mdwn building git-annex-assistant.mdwn building git-annex-reinit.mdwn building git-annex-forget.mdwn building git-annex-adjust.mdwn building git-annex-importfeed.mdwn building git-annex-whereis.mdwn building git-annex-watch.mdwn building git-annex-rekey.mdwn building index.mdwn building license/GPL building license/AGPL building ikiwiki/ikiwiki.js building ikiwiki/relativedate.js building ikiwiki/toggle.js done + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.ozrcUb + umask 022 + cd /builddir/build/BUILD + '[' /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x '!=' / ']' + rm -rf /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x BUILDSTDERR: ++ dirname /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x + mkdir -p /builddir/build/BUILDROOT + mkdir /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x + cd git-annex-7.20190219 + '[' -x Setup ']' + LANG=C.utf8 + ./Setup copy --destdir=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x -v directory dist/doc/html/git-annex does exist: False creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex Installing COPYRIGHT to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex/COPYRIGHT Installing executable git-annex in /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin BUILDSTDERR: Warning: Executable installed in BUILDSTDERR: /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin Installing executable dist/build/git-annex/git-annex to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin/git-annex ln -sf git-annex /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin/git-annex-shell ln -sf git-annex /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin/git-remote-tor-annex creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1 creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man creating /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1 Installing man/git-annex-multicast.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-multicast.1 Installing man/git-annex-unlock.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-unlock.1 Installing man/git-annex-vicfg.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-vicfg.1 Installing man/git-annex-merge.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-merge.1 Installing man/git-annex-info.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-info.1 Installing man/git-annex-direct.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-direct.1 Installing man/git-annex-diffdriver.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-diffdriver.1 Installing man/git-annex-list.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-list.1 Installing man/git-annex-unannex.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-unannex.1 Installing man/git-annex-undo.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-undo.1 Installing man/git-annex-export.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-export.1 Installing man/git-annex-remotedaemon.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-remotedaemon.1 Installing man/git-annex-reinject.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-reinject.1 Installing man/git-annex-pre-commit.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-pre-commit.1 Installing man/git-annex-setpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-setpresentkey.1 Installing man/git-annex-dead.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-dead.1 Installing man/git-annex-enable-tor.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-enable-tor.1 Installing man/git-annex-fix.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-fix.1 Installing man/git-annex-fuzztest.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-fuzztest.1 Installing man/git-annex-dropunused.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-dropunused.1 Installing man/git-annex-ungroup.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-ungroup.1 Installing man/git-annex-find.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-find.1 Installing man/git-annex.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex.1 Installing man/git-annex-repair.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-repair.1 Installing man/git-annex-proxy.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-proxy.1 Installing man/git-annex-setkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-setkey.1 Installing man/git-annex-version.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-version.1 Installing man/git-annex-fsck.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-fsck.1 Installing man/git-annex-schedule.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-schedule.1 Installing man/git-annex-log.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-log.1 Installing man/git-annex-import.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-import.1 Installing man/git-annex-uninit.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-uninit.1 Installing man/git-annex-wanted.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-wanted.1 Installing man/git-annex-map.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-map.1 Installing man/git-annex-vpop.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-vpop.1 Installing man/git-annex-group.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-group.1 Installing man/git-annex-lookupkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-lookupkey.1 Installing man/git-annex-edit.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-edit.1 Installing man/git-annex-semitrust.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-semitrust.1 Installing man/git-annex-examinekey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-examinekey.1 Installing man/git-annex-add.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-add.1 Installing man/git-annex-numcopies.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-numcopies.1 Installing man/git-annex-findref.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-findref.1 Installing man/git-annex-calckey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-calckey.1 Installing man/git-annex-status.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-status.1 Installing man/git-annex-mirror.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-mirror.1 Installing man/git-annex-get.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-get.1 Installing man/git-annex-indirect.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-indirect.1 Installing man/git-annex-p2p.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-p2p.1 Installing man/git-annex-checkpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-checkpresentkey.1 Installing man/git-annex-shell.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-shell.1 Installing man/git-annex-resolvemerge.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-resolvemerge.1 Installing man/git-annex-required.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-required.1 Installing man/git-annex-addurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-addurl.1 Installing man/git-annex-matchexpression.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-matchexpression.1 Installing man/git-remote-tor-annex.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-remote-tor-annex.1 Installing man/git-annex-init.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-init.1 Installing man/git-annex-vadd.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-vadd.1 Installing man/git-annex-enableremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-enableremote.1 Installing man/git-annex-migrate.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-migrate.1 Installing man/git-annex-testremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-testremote.1 Installing man/git-annex-test.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-test.1 Installing man/git-annex-view.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-view.1 Installing man/git-annex-unused.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-unused.1 Installing man/git-annex-registerurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-registerurl.1 Installing man/git-annex-rmurl.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-rmurl.1 Installing man/git-annex-metadata.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-metadata.1 Installing man/git-annex-move.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-move.1 Installing man/git-annex-lock.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-lock.1 Installing man/git-annex-describe.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-describe.1 Installing man/git-annex-drop.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-drop.1 Installing man/git-annex-sync.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-sync.1 Installing man/git-annex-untrust.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-untrust.1 Installing man/git-annex-inprogress.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-inprogress.1 Installing man/git-annex-fromkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-fromkey.1 Installing man/git-annex-addunused.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-addunused.1 Installing man/git-annex-transferkeys.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-transferkeys.1 Installing man/git-annex-copy.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-copy.1 Installing man/git-annex-expire.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-expire.1 Installing man/git-annex-contentlocation.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-contentlocation.1 Installing man/git-annex-trust.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-trust.1 Installing man/git-annex-upgrade.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-upgrade.1 Installing man/git-annex-readpresentkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-readpresentkey.1 Installing man/git-annex-vfilter.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-vfilter.1 Installing man/git-annex-matching-options.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-matching-options.1 Installing man/git-annex-vcycle.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-vcycle.1 Installing man/git-annex-transferkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-transferkey.1 Installing man/git-annex-webapp.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-webapp.1 Installing man/git-annex-dropkey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-dropkey.1 Installing man/git-annex-groupwanted.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-groupwanted.1 Installing man/git-annex-preferred-content.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-preferred-content.1 Installing man/git-annex-initremote.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-initremote.1 Installing man/git-annex-smudge.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-smudge.1 Installing man/git-annex-assistant.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-assistant.1 Installing man/git-annex-reinit.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-reinit.1 Installing man/git-annex-forget.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-forget.1 Installing man/git-annex-adjust.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-adjust.1 Installing man/git-annex-importfeed.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-importfeed.1 Installing man/git-annex-whereis.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-whereis.1 Installing man/git-annex-watch.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-watch.1 Installing man/git-annex-rekey.1 to /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/man/man1/git-annex-rekey.1 BUILDSTDERR: ++ pkg-config --variable=completionsdir bash-completion + bash_completion_dir=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/bash-completion/completions + mkdir -p /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/bash-completion/completions + install -m 644 bash-completion.bash /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/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.SmY83j + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + mkdir test + pushd test ~/build/BUILD/git-annex-7.20190219/test ~/build/BUILD/git-annex-7.20190219 + PATH=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin + git annex test Tests QuickCheck prop_encode_decode_roundtrip: OK (0.12s) +++ OK, passed 1000 tests. prop_encode_c_decode_c_roundtrip: OK (0.11s) +++ OK, passed 1000 tests. prop_isomorphic_key_encode: OK (0.10s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape: OK (0.06s) +++ OK, passed 1000 tests. prop_isomorphic_shellEscape_multiword: OK (2.32s) +++ OK, passed 1000 tests. prop_isomorphic_configEscape: OK (0.05s) +++ OK, passed 1000 tests. prop_parse_show_Config: OK (0.12s) +++ OK, passed 1000 tests. prop_upFrom_basics: OK (0.05s) +++ OK, passed 1000 tests. prop_relPathDirToFile_basics: OK (0.10s) +++ 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.17s) +++ OK, passed 1000 tests. prop_segment_regressionTest: OK +++ OK, passed 1 tests. prop_read_write_transferinfo: OK (1.99s) +++ OK, passed 1000 tests. prop_read_show_inodecache: OK (0.05s) +++ OK, passed 1000 tests. prop_parse_build_log: OK (4.31s) +++ 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.02s) +++ OK, passed 1000 tests. prop_past_sane: OK +++ OK, passed 1 tests. prop_duration_roundtrips: OK (0.01s) +++ OK, passed 1000 tests. prop_metadata_sane: OK (3.13s) +++ OK, passed 1000 tests. prop_metadata_serialize: OK (3.02s) +++ OK, passed 1000 tests. prop_branchView_legal: OK (2.37s) +++ OK, passed 1000 tests. prop_viewPath_roundtrips: OK (0.15s) +++ OK, passed 1000 tests. prop_view_roundtrips: OK (1.77s) +++ OK, passed 1000 tests. prop_viewedFile_rountrips: OK (0.06s) +++ OK, passed 1000 tests. prop_b64_roundtrips: OK (0.01s) +++ OK, passed 1000 tests. prop_standardGroups_parse: OK +++ OK, passed 1 tests. Init Tests Unit Tests v7 unlocked init: add dup: init test repo ok (recording state in git...) OK (0.50s) add: add sha1foo ok (recording state in git...) unlock sha1foo ok (recording state in git...) OK (1.14s) All 2 tests passed (1.65s) BUILDSTDERR: git-annex: git status will show ./foo to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh ./foo OK (0.46s) add extras: add apple ok (recording state in git...) unlock apple ok (recording state in git...) OK (0.42s) shared clone: OK (0.27s) log: + Tue, 5 Mar 2019 10:00:43 UTC foo | 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] OK (0.85s) import: import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (1.75s) reinject: (recording state in git...) reinject sha1foo (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.45s) unannex (no copy): OK (0.16s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (0.28s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.38s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.54s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.22s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.31s) get (ssh remote): get foo (from origin...) 100% 20 B 1 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.31s) move: move foo (from origin...) (checksum...) (recording state in git...) ok (recording state in git...) move foo (to origin...) (checksum...) (recording state in git...) ok (recording state in git...) OK (0.51s) move (ssh remote): move foo (from origin...) 100% 20 B 1 KiB/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 7 KiB/s 0s ok (recording state in git...) OK (0.74s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.88s) lock: add newfile ok (recording state in git...) unlock newfile ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo ok (recording state in git...) unlock foo ok (recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust numcopies.) failed (recording state in git...) BUILDSTDERR: drop: 1 failed OK (0.63s) lock (v7 --force): upgrade ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo (checksum...) ok (recording state in git...) OK (0.43s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (0.64s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) (recording state in git...) OK (0.46s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (1.46s) fix: OK (0.29s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: git-annex: Direct mode is not supported by this repository version. Use git-annex unlock instead. OK (0.28s) trust: trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.33s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.49s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.08s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] BUILDSTDERR: d9957275-ae39-49c0-90f7-3ab3fd484852 -- .t/tmprepo26 [here] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.33s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] OK (0.40s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.17s) migrate: (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (0.55s) migrate (via gitattributes): (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) ok (recording state in git...) migrate foo (checksum...) ok (recording state in git...) OK (0.68s) unused: unused . (checking for unused data...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok unused . (checking for unused data...) (checking origin/HEAD...) (checking master...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok BUILDSTDERR: git-annex: 10 not valid (run git annex unused for list) BUILDSTDERR: git-annex: 501 not valid (run git annex unused for list) add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) ok unused . (checking for unused data...) ok (recording state in git...) unused . (checking for unused data...) ok (recording state in git...) unused . (checking for unused data...) ok OK (1.26s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.54s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile ok (recording state in git...) dir/subfile OK (0.68s) merge: merge git-annex ok OK (0.15s) info: {"available local disk space":"91.68 gigabytes (+1 megabyte reserved)","local annex keys":0,"file":null,"command":"info","backend usage":{"SHA256E":1,"SHA1":1},"repository mode":"indirect","transfers in progress":[],"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","annexed files in working tree":2,"trusted repositories":[],"untrusted repositories":[],"success":true,"semitrusted repositories":[{"description":"web","uuid":"00000000-0000-0000-0000-000000000001","here":false},{"description":"bittorrent","uuid":"00000000-0000-0000-0000-000000000002","here":false},{"description":"test repo [origin]","uuid":"035fdab9-90f9-4dac-b7d3-96f0155a61c3","here":false},{"description":".t/tmprepo35","uuid":"618799a2-cbe3-460a-b77d-43593e8ebf4b","here":true}]} OK (0.19s) version: git-annex version: 7.20190219 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar hook external operating system: linux s390x supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (1.72s) sync: commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo wanted . ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: abb5ffc..fd4ef4d git-annex -> synced/git-annex ok foo drop foo ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: fd4ef4d..42c09e3 git-annex -> synced/git-annex ok OK (2.12s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo39 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo38 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo39 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo38 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo38 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo39 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo40 BUILDSTDERR: d9b562a..f2363be git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo39 BUILDSTDERR: d9b562a..bbf88e0 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo40 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo39 BUILDSTDERR: d9b562a..9aeb69e git-annex -> synced/git-annex ok OK (3.13s) adjusted branch merge regression: upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor ok (recording state in git...) commit [adjusted/master(unlocked) 6d44196] git-annex in .t/tmprepo41 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo42 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo42 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor ok (recording state in git...) commit [adjusted/master(unlocked) ff457a0] git-annex in .t/tmprepo42 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 ff457a0..f8dcca8 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo41 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo41 BUILDSTDERR: 7d37082..718ed92 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 7d37082..718ed92 Fast-forward (Merging into adjusted branch...) Updating aa58c9a..60e9b7b Fast-forward ok pull r2 BUILDSTDERR: From ../../.t/tmprepo42 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: d569d50..ead6d45 git-annex -> r2/git-annex BUILDSTDERR: 2e9f286..718ed92 master -> r2/master BUILDSTDERR: 7d37082..718ed92 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo41 BUILDSTDERR: + aa58c9a...724233a adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (1.79s) adjusted branch subtree regression: upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add a/b/c/d ok (recording state in git...) commit [adjusted/master(unlocked) 0405aa4] git-annex in .t/tmprepo43 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y ok (recording state in git...) commit [adjusted/master(unlocked) 85c499d] git-annex in .t/tmprepo43 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok BUILDSTDERR: Switched to branch 'master' OK (0.60s) conflict resolution: commit (recording state in git...) [master 5fa3b9d] git-annex in .t/tmprepo44 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 1e13b7f] git-annex in .t/tmprepo45 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo45 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master fe15969] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo45 BUILDSTDERR: 1e13b7f..fe15969 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 1e13b7f..fe15969 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo44 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo45 BUILDSTDERR: 1e13b7f..fe15969 master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (1.76s) conflict resolution (adjusted branch): commit (recording state in git...) [master 8baa2da] git-annex in .t/tmprepo46 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 39fc7b1] git-annex in .t/tmprepo47 1 file changed, 1 insertion(+) create mode 100644 conflictor ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo47 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 6800baa] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo47 BUILDSTDERR: 39fc7b1..6800baa master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 39fc7b1..6800baa 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 ffa316a..16d4d16 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo46 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo47 BUILDSTDERR: + ffa316a...cf027ce adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (1.86s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master 794df9f] git-annex in .t/tmprepo48 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo49 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo49 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit BUILDSTDERR: (recording state in git...) [master 5f47e29] git-annex in .t/tmprepo49 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 5f14b3f] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo48 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo48 BUILDSTDERR: 794df9f..5f14b3f master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 794df9f..5f14b3f Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo49 BUILDSTDERR: 486a5e4..7760059 git-annex -> r2/git-annex BUILDSTDERR: 2e9f286..5f14b3f master -> r2/master BUILDSTDERR: 794df9f..5f14b3f synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (1.48s) conflict resolution (mixed directory and file): commit (recording state in git...) [master e7c575f] git-annex in .t/tmprepo50 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master a762042] git-annex in .t/tmprepo51 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo51 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 2a0a78b] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo51 BUILDSTDERR: a762042..2a0a78b master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating a762042..2a0a78b Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo50 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 commit (recording state in git...) [master dcbf568] git-annex in .t/tmprepo52 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit (recording state in git...) [master 7b64768] git-annex in .t/tmprepo53 1 file changed, 1 insertion(+) create mode 100644 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo52 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 c9e117a] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo52 BUILDSTDERR: dcbf568..c9e117a master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating dcbf568..c9e117a Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 100644 conflictor/subfile ok pull r2 BUILDSTDERR: From ../../.t/tmprepo53 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (3.07s) conflict resolution symlink bit: OK conflict resolution (uncommitted local file): commit (recording state in git...) [master 7ca9393] git-annex in .t/tmprepo54 1 file changed, 1 insertion(+) create mode 100644 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo54 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 2e9f286..7ca9393 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 2e9f286..7ca9393 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo54 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo54' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo54 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo54' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. commit (recording state in git...) [master 5b73535] git-annex in .t/tmprepo56 1 file changed, 1 insertion(+) create mode 100644 conflictor/file ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo56 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 2e9f286..5b73535 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 2e9f286..5b73535 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo56 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo56' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo56 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo56' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. OK (1.51s) conflict resolution (removed file): commit (recording state in git...) [master 9498b00] git-annex in .t/tmprepo58 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo58 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 2e9f286..9498b00 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo58 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit [master 6b699a2] git-annex in .t/tmprepo58 1 file changed, 1 deletion(-) delete mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo59 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo59 BUILDSTDERR: 9498b00..6b699a2 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit BUILDSTDERR: (recording state in git...) [master e7f6b72] git-annex in .t/tmprepo59 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 5a87dd1] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo58 BUILDSTDERR: 425591c..d4bbf6c git-annex -> r1/git-annex BUILDSTDERR: 9498b00..6b699a2 master -> r1/master BUILDSTDERR: 9498b00..6b699a2 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo58 BUILDSTDERR: 425591c..e46f576 git-annex -> synced/git-annex BUILDSTDERR: 6b699a2..5a87dd1 master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 6b699a2..5a87dd1 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo59 BUILDSTDERR: d4bbf6c..e46f576 git-annex -> r2/git-annex BUILDSTDERR: 9498b00..5a87dd1 master -> r2/master BUILDSTDERR: 6b699a2..5a87dd1 synced/master -> r2/synced/master ok commit (recording state in git...) [master 5e7f26c] git-annex in .t/tmprepo60 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo60 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 2e9f286..5e7f26c Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo60 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master 07202d9] git-annex in .t/tmprepo61 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo60 BUILDSTDERR: 465984f..35b9926 git-annex -> synced/git-annex BUILDSTDERR: 5e7f26c..07202d9 master -> synced/master ok commit [master 454b72d] git-annex in .t/tmprepo60 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 6512f31] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo61 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo61 BUILDSTDERR: 07202d9..6512f31 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 07202d9..6512f31 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo60 BUILDSTDERR: 5e7f26c..6512f31 master -> r1/master BUILDSTDERR: 07202d9..6512f31 synced/master -> r1/synced/master ok OK (2.82s) conflict resolution (nonannexed file): commit (recording state in git...) [master f5ebbb6] git-annex in .t/tmprepo62 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 999128b] git-annex in .t/tmprepo63 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo63 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master e877cf3] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo63 BUILDSTDERR: 999128b..e877cf3 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 999128b..e877cf3 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo62 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) commit (recording state in git...) [master e5a8a57] git-annex in .t/tmprepo64 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master c4ab442] git-annex in .t/tmprepo65 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo64 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 a934a33] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo64 BUILDSTDERR: e5a8a57..a934a33 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e5a8a57..a934a33 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo65 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (recording state in git...) commit (recording state in git...) [master 6d11e16] git-annex in .t/tmprepo66 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 8f6f8ae] git-annex in .t/tmprepo67 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo67 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master 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 88a54c1] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo67 BUILDSTDERR: 8f6f8ae..88a54c1 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 8f6f8ae..88a54c1 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo66 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) commit (recording state in git...) [master eb3d57d] git-annex in .t/tmprepo68 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 32735d2] git-annex in .t/tmprepo69 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo68 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 fcb7642] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo68 BUILDSTDERR: eb3d57d..fcb7642 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating eb3d57d..fcb7642 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo69 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (recording state in git...) OK (4.75s) conflict resolution (nonannexed symlink): commit (recording state in git...) [master 6fd853a] git-annex in .t/tmprepo70 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 76c83b5] git-annex in .t/tmprepo71 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo71 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master d424daa] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo71 BUILDSTDERR: 76c83b5..d424daa master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 76c83b5..d424daa Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo70 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit (recording state in git...) [master 861189d] git-annex in .t/tmprepo72 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 7680134] git-annex in .t/tmprepo73 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo72 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 67cec33] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo72 BUILDSTDERR: 861189d..67cec33 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 861189d..67cec33 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 conflictor create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo73 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok commit (recording state in git...) [master e1e8b64] git-annex in .t/tmprepo74 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master f908bd8] git-annex in .t/tmprepo75 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo75 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master 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 0de5079] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo75 BUILDSTDERR: f908bd8..0de5079 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f908bd8..0de5079 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo74 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit (recording state in git...) [master e93262a] git-annex in .t/tmprepo76 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit [master 1010fad] git-annex in .t/tmprepo77 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo76 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 9f79078] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo76 BUILDSTDERR: e93262a..9f79078 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating e93262a..9f79078 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 120000 conflictor create mode 100644 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo77 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (3.89s) conflict resolution (mixed locked and unlocked file): add conflictor ok (recording state in git...) commit [master 58c9027] git-annex in .t/tmprepo78 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master 1e5a0a7] git-annex in .t/tmprepo79 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo79 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. BUILDSTDERR: git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor [master b6ee24d] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo79 BUILDSTDERR: 1e5a0a7..b6ee24d master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 1e5a0a7..b6ee24d Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo78 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo79 BUILDSTDERR: 1e5a0a7..b6ee24d master -> r2/master ok conflictor conflictor OK (1.21s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot ok OK (0.19s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was ff57ba6). BUILDSTDERR: ExitSuccess OK (0.27s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (0.37s) upgrade: upgrade ok OK (0.14s) whereis: whereis foo (1 copy) 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 9c136897-0e69-4b98-a3ee-a4f31f6d9f4d -- .t/tmprepo84 [here] The following untrusted locations may also have copies: 035fdab9-90f9-4dac-b7d3-96f0155a61c3 -- test repo [origin] ok OK (0.31s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (0.56s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 70 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 102 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.52s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (0.72s) bup remote: OK (0.13s) crypto: OK (0.41s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.91s) add subdirs: add dir/foo ok (recording state in git...) add ../dir2/foo ok (recording state in git...) OK (0.41s) BUILDSTDERR: addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo94/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo94/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo94/myurl (to _builddir_build_BUILD_git_annex_7.20190219_test_.t_tmprepo94_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo94/myurl (to addurlurldest) ok (recording state in git...) OK (1.24s) Unit Tests v5 add dup: Init Tests init: init test repo ok (recording state in git...) OK (0.04s) add: add foo ok (recording state in git...) add sha1foo ok (recording state in git...) OK (0.11s) All 2 tests passed (0.14s) add foodup ok (recording state in git...) OK (0.13s) add extras: add apple ok (recording state in git...) OK (0.12s) shared clone: OK (0.06s) log: + Tue, 5 Mar 2019 10:01:40 UTC foo | 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] OK (0.08s) import: import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.28s) reinject: (recording state in git...) reinject sha1foo (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.17s) unannex (no copy): OK (0.10s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (0.16s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.18s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.25s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.16s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.18s) get (ssh remote): get foo (from origin...) 100% 20 B 1 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.19s) move: move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (0.35s) move (ssh remote): move foo (from origin...) 100% 20 B 1 KiB/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 35 KiB/s 0s ok (recording state in git...) OK (0.39s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.30s) BUILDSTDERR: lock: content not present; cannot unlock add newfile ok (recording state in git...) BUILDSTDERR: this has not yet been committed to git; cannot unlock it get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo ok (recording state in git...) unlock foo (copying...) ok add 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 BUILDSTDERR: drop: 1 failed OK (0.29s) lock (v7 --force): upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo (checksum...) ok (recording state in git...) OK (0.23s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok BUILDSTDERR: add foo ok BUILDSTDERR: ok BUILDSTDERR: (recording state in git...) OK (0.20s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok add foo ok ok (recording state in git...) OK (0.18s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok BUILDSTDERR: git-annex: Cannot make a partial commit with unlocked annexed files. You should `git annex add` the files you want to commit, and then run git commit. OK (0.14s) fix: get foo (from origin...) (checksum...) ok (recording state in git...) fix s/foo ok (recording state in git...) OK (0.20s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok direct foo ok direct ok commit (recording state in git...) BUILDSTDERR: ok On branch annex/direct/master Changes not staged for commit: typechange: foo no changes added to commit ok indirect foo ok indirect ok ok OK (0.22s) trust: trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.28s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa fsck foo ok fsck sha1foo ok (recording state in git...) OK (0.30s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.06s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] BUILDSTDERR: c60441bf-7e6b-4468-8903-21334e791e7c -- .t/tmprepo121 [here] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.21s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] OK (0.19s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.08s) migrate: (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (0.34s) migrate (via gitattributes): (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (1.06s) unused: unused . (checking for unused data...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok unused . (checking for unused data...) (checking origin/HEAD...) (checking master...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok BUILDSTDERR: git-annex: 10 not valid (run git annex unused for list) BUILDSTDERR: git-annex: 501 not valid (run git annex unused for list) add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) ok OK (0.49s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.09s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile ok (recording state in git...) dir/subfile OK (0.35s) merge: merge git-annex ok OK (0.07s) info: {"available local disk space":"91.58 gigabytes (+1 megabyte reserved)","local annex keys":0,"file":null,"command":"info","backend usage":{"SHA256E":1,"SHA1":1},"repository mode":"indirect","transfers in progress":[],"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","annexed files in working tree":2,"trusted repositories":[],"untrusted repositories":[],"success":true,"semitrusted repositories":[{"description":"web","uuid":"00000000-0000-0000-0000-000000000001","here":false},{"description":"bittorrent","uuid":"00000000-0000-0000-0000-000000000002","here":false},{"description":"test repo [origin]","uuid":"09def44b-96e8-4e8e-9f1a-328bfff46da9","here":false},{"description":".t/tmprepo130","uuid":"fd694fc2-c33a-4315-83e4-c75bb7aa58f4","here":true}]} OK (0.08s) version: git-annex version: 7.20190219 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar hook external operating system: linux s390x supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 OK (0.06s) sync: commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo wanted . ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: a0e8767..1aff281 git-annex -> synced/git-annex ok foo drop foo ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 1aff281..bffe086 git-annex -> synced/git-annex ok OK (0.60s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo134 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo133 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo134 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo133 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo135 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo133 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo135 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo134 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo135 BUILDSTDERR: e7903b7..2ed89bd git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo134 BUILDSTDERR: e7903b7..1e25380 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo135 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo134 BUILDSTDERR: e7903b7..ac6f70d git-annex -> synced/git-annex ok OK (1.12s) adjusted branch merge regression: OK (0.12s) adjusted branch subtree regression: OK (0.07s) conflict resolution: add conflictor ok (recording state in git...) commit [master 02cf967] git-annex in .t/tmprepo139 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor ok (recording state in git...) commit [master 0013c2a] git-annex in .t/tmprepo140 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo140 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master d7bf103] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo140 BUILDSTDERR: 0013c2a..d7bf103 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 0013c2a..d7bf103 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 120000 conflictor.variant-a507 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo139 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo140 BUILDSTDERR: 0013c2a..d7bf103 master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-75dc conflictor.variant-a507 OK (0.63s) conflict resolution (adjusted branch): OK (0.12s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unlock foo (copying...) ok unlock foo (copying...) ok commit BUILDSTDERR: add foo ok BUILDSTDERR: ok BUILDSTDERR: (recording state in git...) [master f09094e] git-annex in .t/tmprepo143 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo144 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo144 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit BUILDSTDERR: add foo ok BUILDSTDERR: ok BUILDSTDERR: (recording state in git...) [master e82c723] git-annex in .t/tmprepo144 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 6a100b3] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo143 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo143 BUILDSTDERR: f09094e..6a100b3 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f09094e..6a100b3 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 120000 foo.variant-bc25 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo144 BUILDSTDERR: bf6f847..79a583a git-annex -> r2/git-annex BUILDSTDERR: a717ea3..6a100b3 master -> r2/master BUILDSTDERR: f09094e..6a100b3 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (0.74s) conflict resolution (mixed directory and file): add conflictor ok (recording state in git...) commit [master 8ba6c1e] git-annex in .t/tmprepo145 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile ok (recording state in git...) commit [master 9f2a2e6] git-annex in .t/tmprepo146 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo146 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master a5fb741] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo146 BUILDSTDERR: 9f2a2e6..a5fb741 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 9f2a2e6..a5fb741 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo145 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 add conflictor ok (recording state in git...) commit [master ede9e06] git-annex in .t/tmprepo147 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile ok (recording state in git...) commit [master 4b3cb1e] git-annex in .t/tmprepo148 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo147 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master aa45781] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo147 BUILDSTDERR: ede9e06..aa45781 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating ede9e06..aa45781 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 120000 conflictor/subfile ok pull r2 BUILDSTDERR: From ../../.t/tmprepo148 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (1.18s) conflict resolution symlink bit: add conflictor ok (recording state in git...) commit [master cc38ae4] git-annex in .t/tmprepo149 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: bffe086..9cb65b0 git-annex -> synced/git-annex BUILDSTDERR: a717ea3..cc38ae4 master -> synced/master ok conflictor add conflictor/subfile ok (recording state in git...) commit [master 859b360] git-annex in .t/tmprepo150 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: bffe086..9cb65b0 git-annex -> origin/git-annex BUILDSTDERR: bffe086..9cb65b0 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: a717ea3..cc38ae4 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 901eff0] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 9cb65b0..f52cf8a git-annex -> synced/git-annex BUILDSTDERR: cc38ae4..901eff0 master -> synced/master ok conflictor/subfile add conflictor ok (recording state in git...) commit [master b4042a8] git-annex in .t/tmprepo151 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: bffe086..f52cf8a git-annex -> origin/git-annex BUILDSTDERR: bffe086..f52cf8a synced/git-annex -> origin/synced/git-annex BUILDSTDERR: a717ea3..901eff0 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 8e373a9] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: f52cf8a..4144b35 git-annex -> synced/git-annex BUILDSTDERR: 901eff0..8e373a9 master -> synced/master ok conflictor/subfile OK (0.79s) conflict resolution (uncommitted local file): add conflictor ok (recording state in git...) commit [master a55accd] git-annex in .t/tmprepo152 1 file changed, 1 insertion(+) create mode 120000 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo152 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating a717ea3..a55accd BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating a717ea3..a55accd BUILDSTDERR: To ../../.t/tmprepo152 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo152' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo152 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo152' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. add conflictor/file ok (recording state in git...) commit [master a306e5d] git-annex in .t/tmprepo154 1 file changed, 1 insertion(+) create mode 120000 conflictor/file ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo154 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating a717ea3..a306e5d BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating a717ea3..a306e5d BUILDSTDERR: To ../../.t/tmprepo154 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo154' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo154 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo154' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. OK (0.69s) conflict resolution (removed file): add conflictor ok (recording state in git...) commit [master 68dbfdc] 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 r1 BUILDSTDERR: From ../../.t/tmprepo156 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating a717ea3..68dbfdc Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo156 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor (copying...) ok commit [master 0d3e4d5] git-annex in .t/tmprepo156 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo157 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo157 BUILDSTDERR: 68dbfdc..0d3e4d5 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit BUILDSTDERR: add conflictor ok BUILDSTDERR: ok BUILDSTDERR: (recording state in git...) [master 476070e] git-annex in .t/tmprepo157 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 ccdc595] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo156 BUILDSTDERR: 23af771..fd670be git-annex -> r1/git-annex BUILDSTDERR: 68dbfdc..0d3e4d5 master -> r1/master BUILDSTDERR: 68dbfdc..0d3e4d5 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo156 BUILDSTDERR: 23af771..afeeb71 git-annex -> synced/git-annex BUILDSTDERR: 0d3e4d5..ccdc595 master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 0d3e4d5..ccdc595 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo157 BUILDSTDERR: fd670be..afeeb71 git-annex -> r2/git-annex BUILDSTDERR: 68dbfdc..ccdc595 master -> r2/master BUILDSTDERR: 0d3e4d5..ccdc595 synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master 2cdfc0f] 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 BUILDSTDERR: From ../../.t/tmprepo158 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating a717ea3..2cdfc0f Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo158 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor (copying...) ok commit BUILDSTDERR: add conflictor ok BUILDSTDERR: ok BUILDSTDERR: (recording state in git...) [master cf6797b] git-annex in .t/tmprepo159 1 file changed, 1 insertion(+), 1 deletion(-) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo158 BUILDSTDERR: aa34316..cc78156 git-annex -> synced/git-annex BUILDSTDERR: 2cdfc0f..cf6797b master -> synced/master ok commit [master 9aef0fe] git-annex in .t/tmprepo158 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 4b6d974] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo159 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo159 BUILDSTDERR: cf6797b..4b6d974 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating cf6797b..4b6d974 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo158 BUILDSTDERR: 2cdfc0f..4b6d974 master -> r1/master BUILDSTDERR: cf6797b..4b6d974 synced/master -> r1/synced/master ok OK (1.53s) conflict resolution (nonannexed file): add conflictor ok (recording state in git...) commit [master 9fc70eb] git-annex in .t/tmprepo160 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master f90a040] git-annex in .t/tmprepo161 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo161 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master bea75d1] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo161 BUILDSTDERR: f90a040..bea75d1 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f90a040..bea75d1 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo160 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor ok (recording state in git...) commit [master b09f787] git-annex in .t/tmprepo162 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 3ea3f5d] git-annex in .t/tmprepo163 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo162 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 25d5b56] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo162 BUILDSTDERR: b09f787..25d5b56 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating b09f787..25d5b56 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 conflictor create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo163 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master 164c41f] git-annex in .t/tmprepo164 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master d757abd] git-annex in .t/tmprepo165 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok direct conflictor ok direct ok commit (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo165 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo165 BUILDSTDERR: d757abd..5ce378a annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok direct ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo164 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: duplicate parent 5ce378a1b654b5e887b547fc6f54671a1713f22d ignored ok push r1 BUILDSTDERR: To ../../.t/tmprepo164 BUILDSTDERR: 5ce378a..a4c7a3a annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok add conflictor ok (recording state in git...) commit [master e32f30b] git-annex in .t/tmprepo166 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 869feb6] git-annex in .t/tmprepo167 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok direct ok commit (recording state in git...) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo166 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo166 BUILDSTDERR: e32f30b..fe88c29 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok direct conflictor ok direct ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo167 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master BUILDSTDERR: error: duplicate parent fe88c29d414ea7f372c3228ed23dc5f0b28ce155 ignored ok push r2 BUILDSTDERR: To ../../.t/tmprepo167 BUILDSTDERR: fe88c29..e43499b annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok OK (2.25s) conflict resolution (nonannexed symlink): add conflictor ok (recording state in git...) commit [master a4e4f77] git-annex in .t/tmprepo168 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 20c8197] git-annex in .t/tmprepo169 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo169 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor 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 e5db9b6] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo169 BUILDSTDERR: 20c8197..e5db9b6 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 20c8197..e5db9b6 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo168 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor ok (recording state in git...) commit [master 78c4cd5] git-annex in .t/tmprepo170 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master b403573] git-annex in .t/tmprepo171 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo170 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor 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 6d336ba] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo170 BUILDSTDERR: 78c4cd5..6d336ba master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 78c4cd5..6d336ba Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo171 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master 65ae884] git-annex in .t/tmprepo172 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master a97ef39] git-annex in .t/tmprepo173 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok direct conflictor ok direct ok commit (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo173 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo173 BUILDSTDERR: a97ef39..026400a annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok direct ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo172 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: error: duplicate parent 026400ae14a41eeb4910002c6bc141be2c0f4506 ignored ok push r1 BUILDSTDERR: To ../../.t/tmprepo172 BUILDSTDERR: 026400a..751ab18 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok add conflictor ok (recording state in git...) commit [master 5ebc4d0] git-annex in .t/tmprepo174 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master bc032d7] git-annex in .t/tmprepo175 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok direct ok commit (recording state in git...) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo174 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo174 BUILDSTDERR: 5ebc4d0..3856f55 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok direct conflictor ok direct ok commit (recording state in git...) ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo175 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master BUILDSTDERR: error: duplicate parent 3856f55b57128ad81e4637c7c8edab82afaa9b36 ignored ok push r2 BUILDSTDERR: To ../../.t/tmprepo175 BUILDSTDERR: 3856f55..5ab96c9 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok OK (3.79s) conflict resolution (mixed locked and unlocked file): commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo177 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull origin Updating a717ea3..8e373a9 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo177 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 4144b35..7a610ac git-annex -> synced/git-annex ok commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok merge synced/master Updating a717ea3..8e373a9 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok pull r1 BUILDSTDERR: From ../../.t/tmprepo176 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 4144b35..7a610ac git-annex -> origin/git-annex BUILDSTDERR: 4144b35..7a610ac synced/git-annex -> origin/synced/git-annex ok commit On branch master Your branch is ahead of 'origin/master' by 5 commits. (use "git push" to publish your local commits) nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo177 BUILDSTDERR: a717ea3..8e373a9 master -> r2/master ok pull origin ok OK (0.57s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot ok OK (0.10s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was b32664b). BUILDSTDERR: ExitSuccess OK (0.13s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (0.08s) upgrade: upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok OK (0.09s) whereis: whereis foo (1 copy) 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 877b1846-e035-487b-9631-f3672d375b7e -- .t/tmprepo182 [here] The following untrusted locations may also have copies: 09def44b-96e8-4e8e-9f1a-328bfff46da9 -- test repo [origin] ok OK (0.18s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (0.31s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 39 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 134 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.31s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (0.49s) bup remote: OK (0.06s) crypto: OK (0.18s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.58s) add subdirs: add dir/foo ok (recording state in git...) commit [master c8ffa9b] git-annex in .t/tmprepo191 1 file changed, 1 insertion(+) create mode 120000 dir/foo ok pull origin Merge made by the 'recursive' strategy. conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 7a610ac..251c695 git-annex -> synced/git-annex BUILDSTDERR: 8e373a9..ef9816b master -> synced/master ok add ../dir2/foo ok (recording state in git...) OK (0.29s) BUILDSTDERR: addurl: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo192/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo192/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo192/myurl (to _builddir_build_BUILD_git_annex_7.20190219_test_.t_tmprepo192_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo192/myurl (to addurlurldest) ok (recording state in git...) OK (0.14s) Unit Tests v7 locked add dup: Init Tests init: init test repo ok (recording state in git...) OK (0.05s) add: add foo ok (recording state in git...) add sha1foo ok (recording state in git...) OK (0.15s) All 2 tests passed (0.20s) add foodup ok (recording state in git...) OK (0.20s) add extras: add apple ok (recording state in git...) OK (0.18s) shared clone: OK (0.11s) log: + Tue, 5 Mar 2019 10:02:05 UTC foo | 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] OK (0.13s) import: import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.35s) reinject: (recording state in git...) reinject sha1foo (checksum...) ok (recording state in git...) fromkey sha1foodup ok (recording state in git...) OK (0.43s) unannex (no copy): OK (0.14s) unannex (with copy): get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok OK (0.19s) drop (no remote): get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.22s) drop (with remote): get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.29s) drop (untrusted remote): untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.22s) get: get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.23s) get (ssh remote): get foo (from origin...) 100% 20 B 2 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.25s) move: move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (0.39s) move (ssh remote): move foo (from origin...) 100% 20 B 2 KiB/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 12 KiB/s 0s ok (recording state in git...) OK (0.45s) copy: copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.36s) lock: add newfile ok (recording state in git...) unlock newfile ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo ok (recording state in git...) unlock foo ok (recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust numcopies.) failed (recording state in git...) BUILDSTDERR: drop: 1 failed OK (0.54s) lock (v7 --force): upgrade ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: git-annex: Locking this file would discard any changes you have made to it. Use 'git annex add' to stage your changes. (Or, use --force to override) lock foo (checksum...) ok (recording state in git...) OK (0.31s) edit (no pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (0.38s) edit (pre-commit): get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) (recording state in git...) OK (0.33s) partial commit: get foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) BUILDSTDERR: (recording state in git...) OK (0.35s) fix: get foo (from origin...) (checksum...) ok (recording state in git...) fix s/foo ok (recording state in git...) OK (0.30s) direct: get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: git-annex: Direct mode is not supported by this repository version. Use git-annex unlock instead. OK (0.23s) trust: trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.30s) fsck (basics): fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) BUILDSTDERR: sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa fsck foo ok fsck sha1foo ok (recording state in git...) OK (0.36s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.08s) fsck (local untrusted): get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] BUILDSTDERR: a050c44f-09cb-42aa-879f-66a3dd2813f5 -- .t/tmprepo219 [here] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.25s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] OK (0.26s) fsck --from remote: fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.13s) migrate: (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (0.50s) migrate (via gitattributes): (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) migrate sha1foo (checksum...) (checksum...) ok (recording state in git...) migrate foo (checksum...) (checksum...) ok (recording state in git...) OK (0.54s) unused: unused . (checking for unused data...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) ok unused . (checking for unused data...) (checking origin/HEAD...) (checking master...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa 2 SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok dropkey SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok (recording state in git...) dropunused 1 ok (recording state in git...) unused . (checking for unused data...) ok BUILDSTDERR: git-annex: 10 not valid (run git annex unused for list) BUILDSTDERR: git-annex: 501 not valid (run git annex unused for list) add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) (checking master...) Some annexed data is no longer used by any files: NUMBER KEY 1 SHA256E-s13--34fd885ed833519fc455e53b264f370d5b12d219e23a703bd249525409c9dbdf (To see where data was previously used, try: git log --stat --no-textconv -S'KEY') To remove unwanted data: git-annex dropunused NUMBER ok add unusedfile ok (recording state in git...) unused . (checking for unused data...) ok unused . (checking for unused data...) ok OK (0.62s) describe: describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.34s) find: get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile ok (recording state in git...) dir/subfile OK (0.47s) merge: merge git-annex ok OK (0.11s) info: {"available local disk space":"91.52 gigabytes (+1 megabyte reserved)","local annex keys":0,"file":null,"command":"info","backend usage":{"SHA256E":1,"SHA1":1},"repository mode":"indirect","transfers in progress":[],"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","annexed files in working tree":2,"trusted repositories":[],"untrusted repositories":[],"success":true,"semitrusted repositories":[{"description":"web","uuid":"00000000-0000-0000-0000-000000000001","here":false},{"description":"bittorrent","uuid":"00000000-0000-0000-0000-000000000002","here":false},{"description":"test repo [origin]","uuid":"6dabd922-c096-4265-aa14-3210aefba439","here":false},{"description":".t/tmprepo228","uuid":"80c3d87e-0b5b-4ba2-92f9-42a436857a2b","here":true}]} OK (0.14s) version: git-annex version: 7.20190219 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar hook external operating system: linux s390x supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 OK (0.12s) sync: commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok get foo (from origin...) (checksum...) ok (recording state in git...) foo wanted . ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 59dcea5..d19b748 git-annex -> synced/git-annex ok foo drop foo ok (recording state in git...) commit On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: d19b748..561b609 git-annex -> synced/git-annex ok OK (1.03s) union merge regression: get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo232 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo231 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo232 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo231 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo233 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo231 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo233 BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo232 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok pull r3 BUILDSTDERR: From ../../.t/tmprepo233 BUILDSTDERR: fb361ea..a80d39a git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo232 BUILDSTDERR: fb361ea..d15acea git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo233 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo232 BUILDSTDERR: fb361ea..7a560c5 git-annex -> synced/git-annex ok OK (1.38s) adjusted branch merge regression: upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor ok (recording state in git...) commit [adjusted/master(unlocked) 63b3b92] git-annex in .t/tmprepo234 1 file changed, 1 insertion(+) create mode 100644 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo235 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo235 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add conflictor ok (recording state in git...) commit [adjusted/master(unlocked) 3638a08] git-annex in .t/tmprepo235 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 3638a08..35a844d Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo234 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo234 BUILDSTDERR: 5a45cd4..4d9f8d9 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating 5a45cd4..4d9f8d9 Fast-forward (Merging into adjusted branch...) Updating 862d4c1..0bad98d Fast-forward ok pull r2 BUILDSTDERR: From ../../.t/tmprepo235 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: 949c692..18bd465 git-annex -> r2/git-annex BUILDSTDERR: 04bdcf4..4d9f8d9 master -> r2/master BUILDSTDERR: 5a45cd4..4d9f8d9 synced/master -> r2/synced/master ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo234 BUILDSTDERR: + 862d4c1...5c7dd9a adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) ok OK (2.57s) adjusted branch subtree regression: upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok add a/b/c/d ok (recording state in git...) commit [adjusted/master(unlocked) 8fb8321] git-annex in .t/tmprepo236 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d ok add a/b/x/y ok (recording state in git...) commit [adjusted/master(unlocked) bca1afc] git-annex in .t/tmprepo236 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y ok BUILDSTDERR: Switched to branch 'master' OK (0.61s) conflict resolution: add conflictor ok (recording state in git...) commit [master a353b5f] git-annex in .t/tmprepo237 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor ok (recording state in git...) commit [master 9d524bf] 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 r2 BUILDSTDERR: From ../../.t/tmprepo238 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 30f2a25] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo238 BUILDSTDERR: 9d524bf..30f2a25 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 9d524bf..30f2a25 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 120000 conflictor.variant-a507 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo237 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo238 BUILDSTDERR: 9d524bf..30f2a25 master -> r2/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-75dc conflictor.variant-a507 OK (0.98s) conflict resolution (adjusted branch): add conflictor ok (recording state in git...) commit [master c6fca20] git-annex in .t/tmprepo239 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor ok (recording state in git...) commit [master f156986] git-annex in .t/tmprepo240 1 file changed, 1 insertion(+) create mode 120000 conflictor ok upgrade ok adjust BUILDSTDERR: Switched to branch 'adjusted/master(unlocked)' ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo240 BUILDSTDERR: * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master f1cab2b] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo240 BUILDSTDERR: f156986..f1cab2b master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch adjusted/master(unlocked) nothing to commit, working tree clean ok merge synced/master (Merging into master...) Updating f156986..f1cab2b 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 b4afbb9..69d8a49 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-75dc (100%) create mode 100644 conflictor.variant-a507 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo239 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo240 BUILDSTDERR: + b4afbb9...f244bb8 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-a507 conflictor.variant-75dc OK (1.77s) conflict resolution movein regression: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unlock foo ok (recording state in git...) unlock foo ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master 9c75da2] git-annex in .t/tmprepo241 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo242 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo242 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] master -> synced/master ok commit BUILDSTDERR: (recording state in git...) [master e792804] git-annex in .t/tmprepo242 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 a1332a0] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo241 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo241 BUILDSTDERR: 9c75da2..a1332a0 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 9c75da2..a1332a0 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + 2 files changed, 1 insertion(+) rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo242 BUILDSTDERR: 86cdcae..898d188 git-annex -> r2/git-annex BUILDSTDERR: 04bdcf4..a1332a0 master -> r2/master BUILDSTDERR: 9c75da2..a1332a0 synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (1.16s) conflict resolution (mixed directory and file): add conflictor ok (recording state in git...) commit [master 9bdf2f7] git-annex in .t/tmprepo243 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile ok (recording state in git...) commit [master 8016fb6] git-annex in .t/tmprepo244 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo244 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master c12e924] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo244 BUILDSTDERR: 8016fb6..c12e924 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 8016fb6..c12e924 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo243 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 add conflictor ok (recording state in git...) commit [master 925b524] git-annex in .t/tmprepo245 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor/subfile ok (recording state in git...) commit [master e6d4315] git-annex in .t/tmprepo246 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo245 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 55b1c02] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo245 BUILDSTDERR: 925b524..55b1c02 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 925b524..55b1c02 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + 2 files changed, 1 insertion(+) rename conflictor => conflictor.variant-cc12 (100%) create mode 120000 conflictor/subfile ok pull r2 BUILDSTDERR: From ../../.t/tmprepo246 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (1.78s) conflict resolution symlink bit: add conflictor ok (recording state in git...) commit [master 7acf44a] git-annex in .t/tmprepo247 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 561b609..b383b80 git-annex -> synced/git-annex BUILDSTDERR: 04bdcf4..7acf44a master -> synced/master ok conflictor add conflictor/subfile ok (recording state in git...) commit [master ce65602] git-annex in .t/tmprepo248 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 561b609..b383b80 git-annex -> origin/git-annex BUILDSTDERR: 561b609..b383b80 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 04bdcf4..7acf44a 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 b67fa14] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: b383b80..bec2a6f git-annex -> synced/git-annex BUILDSTDERR: 7acf44a..b67fa14 master -> synced/master ok conflictor/subfile add conflictor ok (recording state in git...) commit [master ae56f09] git-annex in .t/tmprepo249 1 file changed, 1 insertion(+) create mode 120000 conflictor ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 561b609..bec2a6f git-annex -> origin/git-annex BUILDSTDERR: 561b609..bec2a6f synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 04bdcf4..b67fa14 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 9c79319] git-annex automatic merge conflict fix ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: bec2a6f..8b09b2e git-annex -> synced/git-annex BUILDSTDERR: b67fa14..9c79319 master -> synced/master ok conflictor/subfile OK (1.87s) conflict resolution (uncommitted local file): add conflictor ok (recording state in git...) commit [master 75826c5] git-annex in .t/tmprepo250 1 file changed, 1 insertion(+) create mode 120000 conflictor ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo250 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 04bdcf4..75826c5 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 04bdcf4..75826c5 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo250 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo250' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo250 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo250' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. add conflictor/file ok (recording state in git...) commit [master a3b2821] git-annex in .t/tmprepo252 1 file changed, 1 insertion(+) create mode 120000 conflictor/file ok On branch master Untracked files: conflictor nothing added to commit but untracked files present BUILDSTDERR: From ../../.t/tmprepo252 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 04bdcf4..a3b2821 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting Updating 04bdcf4..a3b2821 BUILDSTDERR: error: The following untracked working tree files would be overwritten by merge: BUILDSTDERR: conflictor BUILDSTDERR: Please move or remove them before you merge. BUILDSTDERR: Aborting BUILDSTDERR: To ../../.t/tmprepo252 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: ! [rejected] master -> synced/master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo252' BUILDSTDERR: hint: Updates were rejected because a pushed branch tip is behind its remote BUILDSTDERR: hint: counterpart. Check out this branch and integrate the remote changes BUILDSTDERR: hint: (e.g. 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: To ../../.t/tmprepo252 BUILDSTDERR: ! [rejected] master -> master (non-fast-forward) BUILDSTDERR: error: failed to push some refs to '../../.t/tmprepo252' BUILDSTDERR: hint: Updates were rejected because the tip of your current branch is behind BUILDSTDERR: hint: its remote counterpart. Integrate the remote changes (e.g. BUILDSTDERR: hint: 'git pull ...') before pushing again. BUILDSTDERR: hint: See the 'Note about fast-forwards' in 'git push --help' for details. BUILDSTDERR: Pushing to r1 failed. OK (1.85s) conflict resolution (removed file): add conflictor ok (recording state in git...) commit [master 7dbada3] git-annex in .t/tmprepo254 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo254 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 04bdcf4..7dbada3 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo254 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master eaad658] git-annex in .t/tmprepo254 1 file changed, 1 deletion(-) delete mode 120000 conflictor ok pull r2 BUILDSTDERR: From ../../.t/tmprepo255 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) push r2 BUILDSTDERR: To ../../.t/tmprepo255 BUILDSTDERR: 7dbada3..eaad658 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit BUILDSTDERR: (recording state in git...) [master fd1dca2] git-annex in .t/tmprepo255 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 4ff8fc7] git-annex automatic merge conflict fix ok pull r1 BUILDSTDERR: From ../../.t/tmprepo254 BUILDSTDERR: e5cd275..6fbb0d0 git-annex -> r1/git-annex BUILDSTDERR: 7dbada3..eaad658 master -> r1/master BUILDSTDERR: 7dbada3..eaad658 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo254 BUILDSTDERR: e5cd275..9040a6d git-annex -> synced/git-annex BUILDSTDERR: eaad658..4ff8fc7 master -> synced/master ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating eaad658..4ff8fc7 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf ok pull r2 BUILDSTDERR: From ../../.t/tmprepo255 BUILDSTDERR: 6fbb0d0..9040a6d git-annex -> r2/git-annex BUILDSTDERR: 7dbada3..4ff8fc7 master -> r2/master BUILDSTDERR: eaad658..4ff8fc7 synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master 492e8b7] git-annex in .t/tmprepo256 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo256 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Updating 04bdcf4..492e8b7 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo256 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) unlock conflictor ok (recording state in git...) commit BUILDSTDERR: (recording state in git...) [master eeed9db] git-annex in .t/tmprepo257 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo256 BUILDSTDERR: 48fb1d3..bb134d8 git-annex -> synced/git-annex BUILDSTDERR: 492e8b7..eeed9db master -> synced/master ok commit [master b298bbf] git-annex in .t/tmprepo256 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 5b8de1a] git-annex automatic merge conflict fix ok pull r2 BUILDSTDERR: From ../../.t/tmprepo257 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok push r2 BUILDSTDERR: To ../../.t/tmprepo257 BUILDSTDERR: eeed9db..5b8de1a master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating eeed9db..5b8de1a Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) ok pull r1 BUILDSTDERR: From ../../.t/tmprepo256 BUILDSTDERR: 492e8b7..5b8de1a master -> r1/master BUILDSTDERR: eeed9db..5b8de1a synced/master -> r1/synced/master ok OK (2.82s) conflict resolution (nonannexed file): add conflictor ok (recording state in git...) commit [master 35b0614] git-annex in .t/tmprepo258 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 732b907] git-annex in .t/tmprepo259 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo259 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 7747564] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo259 BUILDSTDERR: 732b907..7747564 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 732b907..7747564 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo258 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) add conflictor ok (recording state in git...) commit [master 7f4eab4] git-annex in .t/tmprepo260 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 1f4a77e] git-annex in .t/tmprepo261 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo260 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 26c0604] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo260 BUILDSTDERR: 7f4eab4..26c0604 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 7f4eab4..26c0604 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 conflictor create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo261 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master e4f0658] git-annex in .t/tmprepo262 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 6615efe] git-annex in .t/tmprepo263 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo263 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master ef02e3c] git-annex automatic merge conflict fix Already up to date. ok push r2 BUILDSTDERR: To ../../.t/tmprepo263 BUILDSTDERR: 6615efe..ef02e3c master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 6615efe..ef02e3c Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo262 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok (merging r1/git-annex into git-annex...) add conflictor ok (recording state in git...) commit [master 179a806] git-annex in .t/tmprepo264 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master eb5a2e4] git-annex in .t/tmprepo265 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo264 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 0913256] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo264 BUILDSTDERR: 179a806..0913256 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 179a806..0913256 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 conflictor create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo265 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (3.63s) conflict resolution (nonannexed symlink): add conflictor ok (recording state in git...) commit [master 179f72a] git-annex in .t/tmprepo266 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master f6be044] git-annex in .t/tmprepo267 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo267 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 388bc10] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo267 BUILDSTDERR: f6be044..388bc10 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f6be044..388bc10 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo266 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor ok (recording state in git...) commit [master 2239769] git-annex in .t/tmprepo268 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master e2e2bf5] git-annex in .t/tmprepo269 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo268 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 7e6b851] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo268 BUILDSTDERR: 2239769..7e6b851 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 2239769..7e6b851 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo269 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok add conflictor ok (recording state in git...) commit [master 27b803c] git-annex in .t/tmprepo270 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master 4136df6] git-annex in .t/tmprepo271 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo271 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. [master 9c4efd2] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo271 BUILDSTDERR: 4136df6..9c4efd2 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 4136df6..9c4efd2 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-cc12 ok pull r1 BUILDSTDERR: From ../../.t/tmprepo270 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok add conflictor ok (recording state in git...) commit [master 47a2b01] git-annex in .t/tmprepo272 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit [master d518166] git-annex in .t/tmprepo273 1 file changed, 1 insertion(+) create mode 120000 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r1 BUILDSTDERR: From ../../.t/tmprepo272 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master 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 dcfef99] git-annex automatic merge conflict fix Already up to date. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo272 BUILDSTDERR: 47a2b01..dcfef99 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating 47a2b01..dcfef99 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 conflictor.variant-cc12 ok pull r2 BUILDSTDERR: From ../../.t/tmprepo273 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok OK (2.98s) conflict resolution (mixed locked and unlocked file): add conflictor ok (recording state in git...) commit [master 8fe0c99] git-annex in .t/tmprepo274 1 file changed, 1 insertion(+) create mode 120000 conflictor ok add conflictor ok (recording state in git...) unlock conflictor ok (recording state in git...) commit [master f5cacea] git-annex in .t/tmprepo275 1 file changed, 1 insertion(+) create mode 100644 conflictor ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo275 BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. BUILDSTDERR: git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor [master f79c6b9] git-annex automatic merge conflict fix Already up to date. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo275 BUILDSTDERR: f5cacea..f79c6b9 master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit On branch master nothing to commit, working tree clean ok merge synced/master Updating f5cacea..f79c6b9 Fast-forward ok pull r1 BUILDSTDERR: From ../../.t/tmprepo274 BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit On branch master nothing to commit, working tree clean ok pull r2 BUILDSTDERR: From ../../.t/tmprepo275 BUILDSTDERR: f5cacea..f79c6b9 master -> r2/master ok conflictor conflictor OK (1.04s) map: describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot ok OK (0.14s) uninit: get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was c801307). BUILDSTDERR: ExitSuccess OK (0.20s) BUILDSTDERR: uninit (in git-annex branch): Switched to branch 'git-annex' OK (0.29s) upgrade: upgrade ok OK (0.11s) whereis: whereis foo (1 copy) 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 237bd480-6cd8-44a7-ac82-2e5694313e84 -- .t/tmprepo280 [here] The following untrusted locations may also have copies: 6dabd922-c096-4265-aa14-3210aefba439 -- test repo [origin] ok OK (0.75s) hook remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (0.34s) directory remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 84 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 110 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.32s) rsync remote: initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (0.54s) bup remote: OK (0.11s) crypto: OK (0.32s) preferred content: wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.61s) add subdirs: add dir/foo ok (recording state in git...) commit [master ba3679b] git-annex in .t/tmprepo289 1 file changed, 1 insertion(+) create mode 120000 dir/foo ok pull origin Merge made by the 'recursive' strategy. conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 2 files changed, 2 insertions(+) create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 8b09b2e..edd7f1b git-annex -> synced/git-annex BUILDSTDERR: 9c79319..2b87e3a master -> synced/master BUILDSTDERR: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo290/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo290/myurl ok add ../dir2/foo ok (recording state in git...) OK (0.46s) addurl: addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo290/myurl (to _builddir_build_BUILD_git_annex_7.20190219_test_.t_tmprepo290_myurl) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo290/myurl (to addurlurldest) ok (recording state in git...) OK (0.30s) Unit Tests v5 direct add dup: Init Tests init: init test repo ok (recording state in git...) On branch master Initial commit nothing to commit OK (0.07s) add: add foo ok (recording state in git...) add sha1foo ok (recording state in git...) BUILDSTDERR: fatal: this operation must be run in a work tree commit ok OK (0.10s) All 2 tests passed (0.17s) On branch master nothing to commit, working tree clean add foodup ok (recording state in git...) OK (0.14s) add extras: On branch master nothing to commit, working tree clean add apple ok (recording state in git...) OK (0.13s) shared clone: On branch master nothing to commit, working tree clean OK (0.12s) log: On branch master nothing to commit, working tree clean + Tue, 5 Mar 2019 10:02:46 UTC foo | 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] OK (0.11s) import: On branch master nothing to commit, working tree clean import import1/f ok (recording state in git...) import import2/f ok (recording state in git...) import import3/f (duplicate; skipping) ok import import3/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import4/f (duplicate of SHA256E-s16--412037ac71321cda0e499509c53024042c3eea37bad4eacf313ab11a9b2258ba) ok import import5/f ok (recording state in git...) drop import1/f ok (recording state in git...) BUILDSTDERR: Could not verify that the content is still present in the annex; not removing from the import location. OK (0.27s) reinject: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) unannex (no copy): On branch master nothing to commit, working tree clean OK (0.11s) unannex (with copy): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok (recording state in git...) OK (0.15s) drop (no remote): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.18s) drop (with remote): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) drop foo ok (recording state in git...) OK (0.23s) drop (untrusted remote): On branch master nothing to commit, working tree clean untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.18s) get: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) OK (0.20s) get (ssh remote): On branch master nothing to commit, working tree clean get foo (from origin...) 100% 20 B 2 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.20s) move: On branch master nothing to commit, working tree clean move foo (from origin...) (checksum...) ok (recording state in git...) move foo (to origin...) (checksum...) ok (recording state in git...) OK (0.31s) move (ssh remote): On branch master nothing to commit, working tree clean move foo (from origin...) 100% 20 B 2 KiB/s 0s (checksum...) ok (recording state in git...) move foo (to origin...) 100% 20 B 34 KiB/s 0s ok (recording state in git...) OK (0.36s) copy: On branch master nothing to commit, working tree clean copy foo (from origin...) (checksum...) ok (recording state in git...) copy foo ok move foo ok (recording state in git...) OK (0.30s) lock: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.10s) lock (v7 --force): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) edit (no pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) edit (pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) partial commit: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.12s) fix: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.10s) direct: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) trust: On branch master nothing to commit, working tree clean trust origin ok (recording state in git...) trust origin ok (recording state in git...) untrust origin ok (recording state in git...) untrust origin ok (recording state in git...) dead origin ok (recording state in git...) dead origin ok (recording state in git...) semitrust origin ok (recording state in git...) semitrust origin ok (recording state in git...) OK (0.27s) fsck (basics): On branch master nothing to commit, working tree clean fsck foo ok fsck sha1foo ok (recording state in git...) numcopies 2 ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. numcopies 1 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) fsck foo ok fsck sha1foo ok (recording state in git...) OK (0.32s) fsck (bare): fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok (recording state in git...) OK (0.06s) fsck (local untrusted): On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) untrust . ok (recording state in git...) BUILDSTDERR: Only these untrusted locations may have copies of foo BUILDSTDERR: 381edf3c-2cc2-4b03-82cb-cfdbb6d517b4 -- .t/tmprepo317 [here] BUILDSTDERR: 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. BUILDSTDERR: Only these untrusted locations may have copies of sha1foo BUILDSTDERR: 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] BUILDSTDERR: Back it up to trusted locations with git-annex copy. trust . ok (recording state in git...) fsck foo (checksum...) ok (recording state in git...) OK (0.25s) fsck (remote untrusted): On branch master nothing to commit, working tree clean numcopies 2 ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get sha1foo (from origin...) (checksum...) ok (recording state in git...) fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) untrust origin ok (recording state in git...) BUILDSTDERR: Only 1 of 2 trustworthy copies exist of foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] BUILDSTDERR: Only 1 of 2 trustworthy copies exist of sha1foo BUILDSTDERR: Back it up with git-annex copy. BUILDSTDERR: The following untrusted locations may also have copies: BUILDSTDERR: 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] OK (0.22s) fsck --from remote: On branch master nothing to commit, working tree clean fsck foo (checksum...) ok fsck sha1foo (checksum...) ok (recording state in git...) OK (0.12s) migrate: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.10s) migrate (via gitattributes): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) unused: On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) describe: On branch master nothing to commit, working tree clean describe . ok (recording state in git...) describe origin ok (recording state in git...) OK (0.12s) find: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) foo foo sha1foo sha1foo add dir/subfile ok (recording state in git...) dir/subfile OK (0.39s) merge: On branch master nothing to commit, working tree clean merge git-annex ok OK (0.10s) info: On branch master nothing to commit, working tree clean {"available local disk space":"91.5 gigabytes (+1 megabyte reserved)","local annex keys":0,"file":null,"command":"info","backend usage":{"SHA256E":1,"SHA1":1},"repository mode":"direct","transfers in progress":[],"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","annexed files in working tree":2,"trusted repositories":[],"untrusted repositories":[],"success":true,"semitrusted repositories":[{"description":"web","uuid":"00000000-0000-0000-0000-000000000001","here":false},{"description":"bittorrent","uuid":"00000000-0000-0000-0000-000000000002","here":false},{"description":"test repo [origin]","uuid":"6060ef4f-8006-4a68-81be-e164efb5c842","here":false},{"description":".t/tmprepo326","uuid":"d7f42df3-3086-4111-820f-a80d9282318f","here":true}]} OK (0.12s) version: On branch master nothing to commit, working tree clean git-annex version: 7.20190219 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.21 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.1.0 ghc-8.4.4 http-client-0.5.14 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar hook external operating system: linux s390x supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 OK (0.09s) sync: On branch master nothing to commit, working tree clean commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get foo (from origin...) (checksum...) ok (recording state in git...) foo wanted . ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 420787a..bbabc7f git-annex -> synced/git-annex ok foo drop foo ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: bbabc7f..c1ea5f6 git-annex -> synced/git-annex ok OK (0.81s) union merge regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo330 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo329 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master ok (merging r1/git-annex r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo330 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo329 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo331 BUILDSTDERR: * [new branch] annex/direct/master -> r3/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r1 BUILDSTDERR: From ../../.t/tmprepo329 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/git-annex -> r1/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo331 BUILDSTDERR: * [new branch] annex/direct/master -> r3/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r3/git-annex BUILDSTDERR: * [new branch] master -> r3/master BUILDSTDERR: * [new branch] synced/master -> r3/synced/master ok pull r2 BUILDSTDERR: From ../../.t/tmprepo330 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/git-annex -> r2/synced/git-annex BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok drop foo ok (recording state in git...) drop foo ok (recording state in git...) commit ok pull r3 BUILDSTDERR: From ../../.t/tmprepo331 BUILDSTDERR: eaa5a4f..89399b5 git-annex -> r3/git-annex ok pull r2 BUILDSTDERR: From ../../.t/tmprepo330 BUILDSTDERR: eaa5a4f..7417d1b git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (recording state in git...) push r3 BUILDSTDERR: To ../../.t/tmprepo331 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok push r2 BUILDSTDERR: To ../../.t/tmprepo330 BUILDSTDERR: eaa5a4f..1db5c30 git-annex -> synced/git-annex ok OK (1.17s) adjusted branch merge regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.18s) adjusted branch subtree regression: On branch master nothing to commit, working tree clean OK (0.09s) conflict resolution: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok add conflictor ok (recording state in git...) commit ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo336 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master CONFLICT (add/add): Merge conflict in conflictor Auto-merging conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo336 BUILDSTDERR: 0a26202..8d57300 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo335 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo336 BUILDSTDERR: 0a26202..8d57300 annex/direct/master -> r2/annex/direct/master ok get conflictor.variant-75dc (from r2...) (checksum...) ok (recording state in git...) conflictor.variant-75dc conflictor.variant-a507 get conflictor.variant-a507 (from r1...) (checksum...) ok (recording state in git...) conflictor.variant-75dc conflictor.variant-a507 OK (0.73s) conflict resolution (adjusted branch): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.20s) conflict resolution movein regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) commit add foo ok (recording state in git...) ok pull r2 BUILDSTDERR: From ../../.t/tmprepo340 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo340 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok commit add foo ok (recording state in git...) ok merge synced/master Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r1 BUILDSTDERR: From ../../.t/tmprepo339 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo339 BUILDSTDERR: f33a5c5..24076fc annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok (recording state in git...) commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo340 BUILDSTDERR: a60c378..24076fc annex/direct/master -> r2/annex/direct/master BUILDSTDERR: f4af243..62ad2f3 git-annex -> r2/git-annex BUILDSTDERR: f33a5c5..24076fc master -> r2/master BUILDSTDERR: f33a5c5..24076fc synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) get foo.variant-bc25 (from r2...) (checksum...) ok (recording state in git...) get foo.variant-0b0e (from r1...) (checksum...) ok (recording state in git...) OK (0.79s) conflict resolution (mixed directory and file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok add conflictor/subfile ok (recording state in git...) commit ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo342 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo342 BUILDSTDERR: 43e7b97..feabbc0 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo341 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok add conflictor/subfile ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo343 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_r1_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo343 BUILDSTDERR: a7df76f..d852729 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master Adding conflictor/subfile BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo344 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok get conflictor/subfile (from r2...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 get conflictor.variant-cc12 (from r1...) (checksum...) ok (recording state in git...) conflictor/subfile conflictor.variant-cc12 OK (2.82s) conflict resolution symlink bit: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok pull origin ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: c1ea5f6..0af4ca3 git-annex -> synced/git-annex BUILDSTDERR: a60c378..8484799 annex/direct/master -> synced/master ok conflictor add conflictor/subfile ok (recording state in git...) commit ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: c1ea5f6..0af4ca3 git-annex -> origin/git-annex BUILDSTDERR: a60c378..8484799 master -> origin/master BUILDSTDERR: c1ea5f6..0af4ca3 synced/git-annex -> origin/synced/git-annex BUILDSTDERR: a60c378..8484799 synced/master -> origin/synced/master Adding conflictor/subfile CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_master Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 0af4ca3..cafa01e git-annex -> synced/git-annex BUILDSTDERR: 8484799..aa5efc5 annex/direct/master -> synced/master ok conflictor/subfile add conflictor ok (recording state in git...) commit ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: c1ea5f6..cafa01e git-annex -> origin/git-annex BUILDSTDERR: a60c378..aa5efc5 master -> origin/master BUILDSTDERR: c1ea5f6..cafa01e synced/git-annex -> origin/synced/git-annex BUILDSTDERR: a60c378..aa5efc5 synced/master -> origin/synced/master Adding conflictor/subfile CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/master. Adding conflictor as conflictor~HEAD Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging origin/git-annex into git-annex...) (recording state in git...) push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: cafa01e..2659658 git-annex -> synced/git-annex BUILDSTDERR: aa5efc5..87b76f9 annex/direct/master -> synced/master ok conflictor/subfile OK (1.05s) conflict resolution (uncommitted local file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo348 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 4c77c847ed300f474fa96038a8777260a603e2e1 ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo348 BUILDSTDERR: 4c77c84..233aa92 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor/file ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo350 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent efc8e1bc414765cbe8fdf8ad952eb0326e59a27b ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo350 BUILDSTDERR: efc8e1b..0253b12 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor/file (from r1...) (checksum...) ok (recording state in git...) OK (0.96s) conflict resolution (removed file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo352 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 42a4624538097cb3298612d4edef53e3696635af ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo352 BUILDSTDERR: 42a4624..5836df5 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit (recording state in git...) ok merge synced/master Already up to date! BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo353 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo353 BUILDSTDERR: 5836df5..35b7f30 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit add conflictor ok (recording state in git...) ok merge synced/master CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r1 BUILDSTDERR: From ../../.t/tmprepo352 BUILDSTDERR: 42a4624..35b7f30 annex/direct/master -> r1/annex/direct/master BUILDSTDERR: b709686..2c149ce git-annex -> r1/git-annex BUILDSTDERR: 5836df5..35b7f30 master -> r1/master BUILDSTDERR: 5836df5..35b7f30 synced/master -> r1/synced/master ok push r1 BUILDSTDERR: To ../../.t/tmprepo352 BUILDSTDERR: b709686..2c149ce git-annex -> synced/git-annex BUILDSTDERR: 35b7f30..cdf0df2 annex/direct/master -> synced/master ok (recording state in git...) commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r2 BUILDSTDERR: From ../../.t/tmprepo353 BUILDSTDERR: 5836df5..cdf0df2 annex/direct/master -> r2/annex/direct/master BUILDSTDERR: 2c149ce..53fb5e5 git-annex -> r2/git-annex BUILDSTDERR: 35b7f30..cdf0df2 master -> r2/master BUILDSTDERR: 35b7f30..cdf0df2 synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean add conflictor ok (recording state in git...) commit ok commit ok pull r1 BUILDSTDERR: From ../../.t/tmprepo354 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 424573b3f2b3edf60911436c63a9a3fbd4037ca8 ignored ok (merging r1/git-annex into git-annex...) (recording state in git...) push r1 BUILDSTDERR: To ../../.t/tmprepo354 BUILDSTDERR: 424573b..0754bc6 annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok get conflictor (from r1...) (checksum...) ok (recording state in git...) commit add conflictor ok (recording state in git...) ok pull r1 ok push r1 BUILDSTDERR: To ../../.t/tmprepo354 BUILDSTDERR: de2115c..4168113 git-annex -> synced/git-annex BUILDSTDERR: 0754bc6..ab5a8e5 annex/direct/master -> synced/master ok (recording state in git...) commit (recording state in git...) ok merge synced/master CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced/master of conflictor left in tree. Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge (recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r2 BUILDSTDERR: From ../../.t/tmprepo355 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master BUILDSTDERR: * [new branch] synced/master -> r2/synced/master ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo355 BUILDSTDERR: ab5a8e5..d70b2ed annex/direct/master -> synced/master BUILDSTDERR: * [new branch] git-annex -> synced/git-annex ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo354 BUILDSTDERR: 424573b..d70b2ed annex/direct/master -> r1/annex/direct/master BUILDSTDERR: 4168113..065489b git-annex -> r1/git-annex BUILDSTDERR: ab5a8e5..d70b2ed master -> r1/master BUILDSTDERR: ab5a8e5..d70b2ed synced/master -> r1/synced/master ok OK (1.83s) conflict resolution (nonannexed file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.74s) conflict resolution (nonannexed symlink): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.74s) conflict resolution (mixed locked and unlocked file): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo373 BUILDSTDERR: * [new branch] annex/direct/master -> r2/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r2/git-annex BUILDSTDERR: * [new branch] master -> r2/master ok pull origin BUILDSTDERR: Automatic merge went well; stopped before committing as requested BUILDSTDERR: error: duplicate parent 87b76f9596059a8fff206d568a0324f93a943ba8 ignored ok (merging r2/git-annex into git-annex...) (recording state in git...) push r2 BUILDSTDERR: To ../../.t/tmprepo373 BUILDSTDERR: * [new branch] git-annex -> synced/git-annex BUILDSTDERR: * [new branch] annex/direct/master -> synced/master ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 2659658..3fca31d git-annex -> synced/git-annex BUILDSTDERR: 87b76f9..52de38f annex/direct/master -> synced/master ok commit ok merge synced/master BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok pull r1 BUILDSTDERR: From ../../.t/tmprepo372 BUILDSTDERR: * [new branch] annex/direct/master -> r1/annex/direct/master BUILDSTDERR: * [new branch] git-annex -> r1/git-annex BUILDSTDERR: * [new branch] master -> r1/master BUILDSTDERR: * [new branch] synced/master -> r1/synced/master ok pull origin BUILDSTDERR: From /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 2659658..3fca31d git-annex -> origin/git-annex BUILDSTDERR: 87b76f9..52de38f master -> origin/master BUILDSTDERR: 2659658..3fca31d synced/git-annex -> origin/synced/git-annex BUILDSTDERR: 87b76f9..52de38f synced/master -> origin/synced/master ok commit ok pull r2 BUILDSTDERR: From ../../.t/tmprepo373 BUILDSTDERR: a60c378..52de38f annex/direct/master -> r2/annex/direct/master ok pull origin ok OK (0.71s) map: On branch master nothing to commit, working tree clean describe . ok (recording state in git...) describe origin ok (recording state in git...) map . ok map ../repo ok left map in .git/annex/map.dot ok OK (0.15s) uninit: On branch master nothing to commit, working tree clean get foo (from origin...) (checksum...) ok get sha1foo (from origin...) (checksum...) ok (recording state in git...) unannex foo ok unannex sha1foo ok Deleted branch git-annex (was 73a6121). BUILDSTDERR: ExitSuccess OK (0.17s) uninit (in git-annex branch): On branch master nothing to commit, working tree clean not supported in direct mode; skipping OK (0.11s) upgrade: On branch master nothing to commit, working tree clean upgrade (v5 to v6...) (scanning for unlocked files...) (v6 to v7...) ok (recording state in git...) OK (0.15s) whereis: On branch master nothing to commit, working tree clean whereis foo (1 copy) 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] ok untrust origin ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) whereis foo (1 copy) 36f95dbc-517f-4267-918a-54f4aa218db9 -- .t/tmprepo378 [here] The following untrusted locations may also have copies: 6060ef4f-8006-4a68-81be-e164efb5c842 -- test repo [origin] ok OK (0.21s) hook remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) (checksum...) ok (recording state in git...) OK (0.34s) directory remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (to foo...) 100% 20 B 59 KiB/s 0s ok (recording state in git...) drop foo ok (recording state in git...) move foo (from foo...) 100% 20 B 138 KiB/s 0s (checksum...) ok (recording state in git...) OK (0.30s) rsync remote: On branch master nothing to commit, working tree clean initremote foo ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) copy foo (checking foo...) (to foo...) sending incremental file list 6cd/ 6cd/e82/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/ 6cd/e82/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/5) ok (recording state in git...) drop foo (checking foo...) ok (recording state in git...) move foo (from foo...) SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1) (checksum...) ok (recording state in git...) OK (0.51s) bup remote: On branch master nothing to commit, working tree clean OK (0.09s) crypto: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean OK (0.30s) preferred content: On branch master nothing to commit, working tree clean wanted . ok (recording state in git...) group . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) copy foo (from origin...) (checksum...) ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) group . ok (recording state in git...) drop foo ok (recording state in git...) ungroup . ok (recording state in git...) wanted . ok (recording state in git...) get foo (from origin...) (checksum...) ok (recording state in git...) drop foo ok (recording state in git...) OK (0.76s) add subdirs: On branch master nothing to commit, working tree clean add dir/foo ok (recording state in git...) commit ok pull origin BUILDSTDERR: Automatic merge went well; stopped before committing as requested ok push origin BUILDSTDERR: To /builddir/build/BUILD/git-annex-7.20190219/test/.t/repo BUILDSTDERR: 3fca31d..db50e04 git-annex -> synced/git-annex BUILDSTDERR: 52de38f..a9959eb annex/direct/master -> synced/master ok add ../dir2/foo ok (recording state in git...) OK (0.35s) addurl: On branch master nothing to commit, working tree clean BUILDSTDERR: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo388/myurl BUILDSTDERR: download failed: Configuration does not allow accessing file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo388/myurl addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo388/myurl (to _builddir_build_BUILD_git_annex_7.20190219_test_.t_tmprepo388_myurl) (recording state in git...) ok (recording state in git...) addurl file:///builddir/build/BUILD/git-annex-7.20190219/test/.t/tmprepo388/myurl (to addurlurldest) (recording state in git...) ok OK (0.17s) All 291 tests passed (167.86s) + popd ~/build/BUILD/git-annex-7.20190219 + exit 0 Processing files: git-annex-7.20190219-2.fc30.s390x Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.3TzzGw + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex + export LC_ALL=C + LC_ALL=C + export DOCDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex + cp -pr CHANGELOG /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex + cp -pr NEWS /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex + cp -pr README /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.MA1EXi + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex + export LC_ALL=C + LC_ALL=C + export LICENSEDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex + exit 0 Provides: git-annex = 7.20190219-2.fc30 git-annex(s390-64) = 7.20190219-2.fc30 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.10)(64bit) libc.so.6(GLIBC_2.11)(64bit) libc.so.6(GLIBC_2.2)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.2)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.6)(64bit) libc.so.6(GLIBC_2.7)(64bit) libc.so.6(GLIBC_2.8)(64bit) libdl.so.2()(64bit) libdl.so.2(GLIBC_2.2)(64bit) libffi.so.6()(64bit) libgmp.so.10()(64bit) libm.so.6()(64bit) libm.so.6(GLIBC_2.2)(64bit) libm.so.6(GLIBC_2.27)(64bit) libm.so.6(GLIBC_2.29)(64bit) libmagic.so.1()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.12)(64bit) libpthread.so.0(GLIBC_2.2)(64bit) libpthread.so.0(GLIBC_2.3.2)(64bit) librt.so.1()(64bit) librt.so.1(GLIBC_2.2)(64bit) libsqlite3.so.0()(64bit) libz.so.1()(64bit) rtld(GNU_HASH) Processing files: git-annex-docs-7.20190219-2.fc30.noarch Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.gtofAe + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + DOCDIR=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/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.20190219-2.fc30.s390x/usr/share/doc/git-annex-docs + cp -pr html/ /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/doc/git-annex-docs + exit 0 Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.EgWdo9 + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + LICENSEDIR=/builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/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.20190219-2.fc30.s390x/usr/share/licenses/git-annex-docs + cp -pr COPYRIGHT /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex-docs + cp -pr doc/license/AGPL /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex-docs + cp -pr doc/license/GPL /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x/usr/share/licenses/git-annex-docs + exit 0 Provides: git-annex-docs = 7.20190219-2.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.20190219-2.fc30.s390x Wrote: /builddir/build/RPMS/git-annex-7.20190219-2.fc30.s390x.rpm Wrote: /builddir/build/RPMS/git-annex-docs-7.20190219-2.fc30.noarch.rpm Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.ULwxrx + umask 022 + cd /builddir/build/BUILD + cd git-annex-7.20190219 + /usr/bin/rm -rf /builddir/build/BUILDROOT/git-annex-7.20190219-2.fc30.s390x + exit 0 Child return code was: 0