Diff of the two buildlogs: -- --- b1/build.log 2021-04-24 15:36:08.142756486 +0000 +++ b2/build.log 2021-04-24 15:57:21.632933565 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Fri May 27 09:08:31 -12 2022 -I: pbuilder-time-stamp: 1653685711 +I: Current time: Sun Apr 25 05:36:10 +14 2021 +I: pbuilder-time-stamp: 1619278570 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz] I: copying local configuration @@ -17,7 +17,7 @@ I: Extracting source gpgv: unknown type of key resource 'trustedkeys.kbx' gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error -gpgv: Signature made Sun Mar 31 07:35:18 2019 -12 +gpgv: Signature made Mon Apr 1 09:35:18 2019 +14 gpgv: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240 gpgv: Can't check signature: No public key dpkg-source: warning: failed to verify signature on ./git-annex_7.20190129-3.dsc @@ -28,136 +28,170 @@ dpkg-source: info: applying debian-changes I: using fakeroot in build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/51633/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/D01_modify_environment starting +debug: Running on ionos1-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +Removing 'diversion of /bin/sh to /bin/sh.distrib by dash' +Adding 'diversion of /bin/sh to /bin/sh.distrib by bash' +Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash' +Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash' +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='amd64' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=16' - DISTRIBUTION='' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.0.3(1)-release' + BUILDDIR=/build + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=15' + DIRSTACK=() + DISTRIBUTION= + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='f6c5cb9a348f44c696060529905eb3dd' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='51633' - PS1='# ' - PS2='> ' + INVOCATION_ID=bf79a721ef4443198448c9b7568a0849 + LANG=C + LANGUAGE=et_EE:et + LC_ALL=C + MACHTYPE=x86_64-pc-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=13283 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.5pJlF2grQp/pbuilderrc_hxm3 --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.5pJlF2grQp/b1 --logfile b1/build.log git-annex_7.20190129-3.dsc' - SUDO_GID='110' - SUDO_UID='105' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://85.184.249.68:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.5pJlF2grQp/pbuilderrc_C0Jl --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.5pJlF2grQp/b2 --logfile b2/build.log git-annex_7.20190129-3.dsc' + SUDO_GID=110 + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://78.137.99.97:3128 I: uname -a - Linux ionos5-amd64 5.10.0-0.bpo.5-amd64 #1 SMP Debian 5.10.24-1~bpo10+1 (2021-03-29) x86_64 GNU/Linux + Linux i-capture-the-hostname 4.19.0-16-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) x86_64 GNU/Linux I: ls -l /bin total 5116 - -rwxr-xr-x 1 root root 1168776 Apr 17 2019 bash - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bunzip2 - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bzcat - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2227 Jul 10 2019 bzdiff - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4877 Jun 24 2019 bzexe - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3641 Jul 10 2019 bzgrep - -rwxr-xr-x 3 root root 38984 Jul 10 2019 bzip2 - -rwxr-xr-x 1 root root 14328 Jul 10 2019 bzip2recover - lrwxrwxrwx 1 root root 6 Jul 10 2019 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Jul 10 2019 bzmore - -rwxr-xr-x 1 root root 43744 Feb 28 2019 cat - -rwxr-xr-x 1 root root 64320 Feb 28 2019 chgrp - -rwxr-xr-x 1 root root 64288 Feb 28 2019 chmod - -rwxr-xr-x 1 root root 72512 Feb 28 2019 chown - -rwxr-xr-x 1 root root 146880 Feb 28 2019 cp - -rwxr-xr-x 1 root root 121464 Jan 17 2019 dash - -rwxr-xr-x 1 root root 109408 Feb 28 2019 date - -rwxr-xr-x 1 root root 76712 Feb 28 2019 dd - -rwxr-xr-x 1 root root 93744 Feb 28 2019 df - -rwxr-xr-x 1 root root 138856 Feb 28 2019 dir - -rwxr-xr-x 1 root root 84288 Jan 9 2019 dmesg - lrwxrwxrwx 1 root root 8 Sep 26 2018 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Sep 26 2018 domainname -> hostname - -rwxr-xr-x 1 root root 39520 Feb 28 2019 echo - -rwxr-xr-x 1 root root 28 Jan 7 2019 egrep - -rwxr-xr-x 1 root root 35424 Feb 28 2019 false - -rwxr-xr-x 1 root root 28 Jan 7 2019 fgrep - -rwxr-xr-x 1 root root 68880 Jan 9 2019 findmnt - -rwsr-xr-x 1 root root 34896 Apr 22 2020 fusermount - -rwxr-xr-x 1 root root 198976 Jan 7 2019 grep - -rwxr-xr-x 2 root root 2345 Jan 5 2019 gunzip - -rwxr-xr-x 1 root root 6375 Jan 5 2019 gzexe - -rwxr-xr-x 1 root root 98048 Jan 5 2019 gzip - -rwxr-xr-x 1 root root 26696 Sep 26 2018 hostname - -rwxr-xr-x 1 root root 68552 Feb 28 2019 ln - -rwxr-xr-x 1 root root 56760 Jul 26 2018 login - -rwxr-xr-x 1 root root 138856 Feb 28 2019 ls - -rwxr-xr-x 1 root root 108624 Jan 9 2019 lsblk - -rwxr-xr-x 1 root root 89088 Feb 28 2019 mkdir - -rwxr-xr-x 1 root root 68544 Feb 28 2019 mknod - -rwxr-xr-x 1 root root 43808 Feb 28 2019 mktemp - -rwxr-xr-x 1 root root 43008 Jan 9 2019 more - -rwsr-xr-x 1 root root 51280 Jan 9 2019 mount - -rwxr-xr-x 1 root root 14408 Jan 9 2019 mountpoint - -rwxr-xr-x 1 root root 138728 Feb 28 2019 mv - lrwxrwxrwx 1 root root 8 Sep 26 2018 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Feb 14 2019 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 39616 Feb 28 2019 pwd - lrwxrwxrwx 1 root root 4 Apr 17 2019 rbash -> bash - -rwxr-xr-x 1 root root 47776 Feb 28 2019 readlink - -rwxr-xr-x 1 root root 68416 Feb 28 2019 rm - -rwxr-xr-x 1 root root 47776 Feb 28 2019 rmdir - -rwxr-xr-x 1 root root 23312 Jan 21 2019 run-parts - -rwxr-xr-x 1 root root 122224 Dec 22 2018 sed - lrwxrwxrwx 1 root root 4 May 24 03:07 sh -> dash - -rwxr-xr-x 1 root root 39552 Feb 28 2019 sleep - -rwxr-xr-x 1 root root 80672 Feb 28 2019 stty - -rwsr-xr-x 1 root root 63568 Jan 9 2019 su - -rwxr-xr-x 1 root root 35488 Feb 28 2019 sync - -rwxr-xr-x 1 root root 445560 Apr 23 2019 tar - -rwxr-xr-x 1 root root 14440 Jan 21 2019 tempfile - -rwxr-xr-x 1 root root 97152 Feb 28 2019 touch - -rwxr-xr-x 1 root root 35424 Feb 28 2019 true - -rwxr-xr-x 1 root root 14328 Apr 22 2020 ulockmgr_server - -rwsr-xr-x 1 root root 34888 Jan 9 2019 umount - -rwxr-xr-x 1 root root 39584 Feb 28 2019 uname - -rwxr-xr-x 2 root root 2345 Jan 5 2019 uncompress - -rwxr-xr-x 1 root root 138856 Feb 28 2019 vdir - -rwxr-xr-x 1 root root 34896 Jan 9 2019 wdctl - -rwxr-xr-x 1 root root 946 Jan 21 2019 which - lrwxrwxrwx 1 root root 8 Sep 26 2018 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1983 Jan 5 2019 zcat - -rwxr-xr-x 1 root root 1677 Jan 5 2019 zcmp - -rwxr-xr-x 1 root root 5879 Jan 5 2019 zdiff - -rwxr-xr-x 1 root root 29 Jan 5 2019 zegrep - -rwxr-xr-x 1 root root 29 Jan 5 2019 zfgrep - -rwxr-xr-x 1 root root 2080 Jan 5 2019 zforce - -rwxr-xr-x 1 root root 7584 Jan 5 2019 zgrep - -rwxr-xr-x 1 root root 2205 Jan 5 2019 zless - -rwxr-xr-x 1 root root 1841 Jan 5 2019 zmore - -rwxr-xr-x 1 root root 4552 Jan 5 2019 znew -I: user script /srv/workspace/pbuilder/51633/tmp/hooks/D02_print_environment finished + -rwxr-xr-x 1 root root 1168776 Apr 18 2019 bash + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bunzip2 + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bzcat + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2227 Jul 11 2019 bzdiff + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4877 Jun 25 2019 bzexe + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3641 Jul 11 2019 bzgrep + -rwxr-xr-x 3 root root 38984 Jul 11 2019 bzip2 + -rwxr-xr-x 1 root root 14328 Jul 11 2019 bzip2recover + lrwxrwxrwx 1 root root 6 Jul 11 2019 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Jul 11 2019 bzmore + -rwxr-xr-x 1 root root 43744 Mar 1 2019 cat + -rwxr-xr-x 1 root root 64320 Mar 1 2019 chgrp + -rwxr-xr-x 1 root root 64288 Mar 1 2019 chmod + -rwxr-xr-x 1 root root 72512 Mar 1 2019 chown + -rwxr-xr-x 1 root root 146880 Mar 1 2019 cp + -rwxr-xr-x 1 root root 121464 Jan 18 2019 dash + -rwxr-xr-x 1 root root 109408 Mar 1 2019 date + -rwxr-xr-x 1 root root 76712 Mar 1 2019 dd + -rwxr-xr-x 1 root root 93744 Mar 1 2019 df + -rwxr-xr-x 1 root root 138856 Mar 1 2019 dir + -rwxr-xr-x 1 root root 84288 Jan 10 2019 dmesg + lrwxrwxrwx 1 root root 8 Sep 27 2018 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Sep 27 2018 domainname -> hostname + -rwxr-xr-x 1 root root 39520 Mar 1 2019 echo + -rwxr-xr-x 1 root root 28 Jan 8 2019 egrep + -rwxr-xr-x 1 root root 35424 Mar 1 2019 false + -rwxr-xr-x 1 root root 28 Jan 8 2019 fgrep + -rwxr-xr-x 1 root root 68880 Jan 10 2019 findmnt + -rwsr-xr-x 1 root root 34896 Apr 23 2020 fusermount + -rwxr-xr-x 1 root root 198976 Jan 8 2019 grep + -rwxr-xr-x 2 root root 2345 Jan 6 2019 gunzip + -rwxr-xr-x 1 root root 6375 Jan 6 2019 gzexe + -rwxr-xr-x 1 root root 98048 Jan 6 2019 gzip + -rwxr-xr-x 1 root root 26696 Sep 27 2018 hostname + -rwxr-xr-x 1 root root 68552 Mar 1 2019 ln + -rwxr-xr-x 1 root root 56760 Jul 27 2018 login + -rwxr-xr-x 1 root root 138856 Mar 1 2019 ls + -rwxr-xr-x 1 root root 108624 Jan 10 2019 lsblk + -rwxr-xr-x 1 root root 89088 Mar 1 2019 mkdir + -rwxr-xr-x 1 root root 68544 Mar 1 2019 mknod + -rwxr-xr-x 1 root root 43808 Mar 1 2019 mktemp + -rwxr-xr-x 1 root root 43008 Jan 10 2019 more + -rwsr-xr-x 1 root root 51280 Jan 10 2019 mount + -rwxr-xr-x 1 root root 14408 Jan 10 2019 mountpoint + -rwxr-xr-x 1 root root 138728 Mar 1 2019 mv + lrwxrwxrwx 1 root root 8 Sep 27 2018 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Feb 15 2019 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 39616 Mar 1 2019 pwd + lrwxrwxrwx 1 root root 4 Apr 18 2019 rbash -> bash + -rwxr-xr-x 1 root root 47776 Mar 1 2019 readlink + -rwxr-xr-x 1 root root 68416 Mar 1 2019 rm + -rwxr-xr-x 1 root root 47776 Mar 1 2019 rmdir + -rwxr-xr-x 1 root root 23312 Jan 22 2019 run-parts + -rwxr-xr-x 1 root root 122224 Dec 23 2018 sed + lrwxrwxrwx 1 root root 4 Apr 25 05:36 sh -> bash + lrwxrwxrwx 1 root root 4 Apr 21 22:46 sh.distrib -> dash + -rwxr-xr-x 1 root root 39552 Mar 1 2019 sleep + -rwxr-xr-x 1 root root 80672 Mar 1 2019 stty + -rwsr-xr-x 1 root root 63568 Jan 10 2019 su + -rwxr-xr-x 1 root root 35488 Mar 1 2019 sync + -rwxr-xr-x 1 root root 445560 Apr 24 2019 tar + -rwxr-xr-x 1 root root 14440 Jan 22 2019 tempfile + -rwxr-xr-x 1 root root 97152 Mar 1 2019 touch + -rwxr-xr-x 1 root root 35424 Mar 1 2019 true + -rwxr-xr-x 1 root root 14328 Apr 23 2020 ulockmgr_server + -rwsr-xr-x 1 root root 34888 Jan 10 2019 umount + -rwxr-xr-x 1 root root 39584 Mar 1 2019 uname + -rwxr-xr-x 2 root root 2345 Jan 6 2019 uncompress + -rwxr-xr-x 1 root root 138856 Mar 1 2019 vdir + -rwxr-xr-x 1 root root 34896 Jan 10 2019 wdctl + -rwxr-xr-x 1 root root 946 Jan 22 2019 which + lrwxrwxrwx 1 root root 8 Sep 27 2018 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1983 Jan 6 2019 zcat + -rwxr-xr-x 1 root root 1677 Jan 6 2019 zcmp + -rwxr-xr-x 1 root root 5879 Jan 6 2019 zdiff + -rwxr-xr-x 1 root root 29 Jan 6 2019 zegrep + -rwxr-xr-x 1 root root 29 Jan 6 2019 zfgrep + -rwxr-xr-x 1 root root 2080 Jan 6 2019 zforce + -rwxr-xr-x 1 root root 7584 Jan 6 2019 zgrep + -rwxr-xr-x 1 root root 2205 Jan 6 2019 zless + -rwxr-xr-x 1 root root 1841 Jan 6 2019 zmore + -rwxr-xr-x 1 root root 4552 Jan 6 2019 znew +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -713,7 +747,7 @@ Get: 348 http://deb.debian.org/debian buster/main amd64 libghc-yesod-static-dev amd64 1.6.0-3+b1 [233 kB] Get: 349 http://deb.debian.org/debian buster/main amd64 libpopt0 amd64 1.16-12 [49.4 kB] Get: 350 http://deb.debian.org/debian buster/main amd64 rsync amd64 3.1.3-6 [397 kB] -Fetched 190 MB in 4s (52.2 MB/s) +Fetched 190 MB in 6s (30.7 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libbsd0:amd64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19195 files and directories currently installed.) @@ -2141,7 +2175,7 @@ fakeroot is already the newest version (1.23-1). 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/git-annex-7.20190129/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b +I: Running cd /build/git-annex-7.20190129/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b dpkg-buildpackage: info: source package git-annex dpkg-buildpackage: info: source version 7.20190129-3 dpkg-buildpackage: info: source distribution unstable @@ -3842,16 +3876,16 @@ building wikiicons/diff.png building templates/popup.mdwn building special_remotes/rsync/comment_9_5dcf10a502b2d4feac46b620d43e9d00._comment, which links to special_remotes -building walkthrough/modifying_annexed_files/comment_1_624b4a0b521b553d68ab6049f7dbaf8c._comment, which links to special_remotes building backends/comment_2_1f2626eca9004b31a0b7fc1a0df8027b._comment, which links to special_remotes building special_remotes/rsync/comment_2_25545dc0b53f09ae73b29899c8884b02._comment, which links to special_remotes +building walkthrough/modifying_annexed_files/comment_1_624b4a0b521b553d68ab6049f7dbaf8c._comment, which links to special_remotes building tips/Repositories_with_large_number_of_files/comment_6_9169a33c06cf8aea231cdd8f51ce17b6._comment, which links to scalability building git-annex-preferred-content/comment_2_e4e0f34466db1fecd21db0e929530ad0._comment, which links to preferred_content building tips/setup_a_public_repository_on_a_web_site/comment_2_b98b761dee9d923153e3c288c1d987ee._comment, which links to preferred_content building bare_repositories/comment_6_bf227861ec3cb2ea474c143218c68133._comment, which links to internals +building git-annex-setpresentkey/comment_3_30a5d3fbd8e02726989ab80ed98b4a54._comment, which links to internals building backends/comment_10_920cd139dfec8adb1089f5acf26de4d2._comment, which links to internals building special_remotes/tahoe/comment_9_75eccd07ea57f44d5a198533a907225a._comment, which links to internals -building git-annex-setpresentkey/comment_3_30a5d3fbd8e02726989ab80ed98b4a54._comment, which links to internals building walkthrough/unused_data/comment_5_46acb9fbbd5ef19f65115723888f3eb6._comment, which links to git-annex-unused building git-annex-undo/comment_4_18ed23e07ffed1cbf63e71fb115b0654._comment, which links to git-annex-unannex building tips/owncloudannex/comment_9_e52582d76e9b57cc11791f2730389605._comment, which links to git-annex-export @@ -3899,23 +3933,23 @@ ./git-annex test Tests QuickCheck - prop_encode_decode_roundtrip: OK (0.21s) + prop_encode_decode_roundtrip: OK (0.19s) +++ OK, passed 1000 tests. - prop_encode_c_decode_c_roundtrip: OK (0.19s) + prop_encode_c_decode_c_roundtrip: OK (0.12s) +++ OK, passed 1000 tests. - prop_isomorphic_key_encode: OK (0.16s) + prop_isomorphic_key_encode: OK (0.13s) +++ OK, passed 1000 tests. - prop_isomorphic_shellEscape: OK (0.11s) + prop_isomorphic_shellEscape: OK (0.10s) +++ OK, passed 1000 tests. - prop_isomorphic_shellEscape_multiword: OK (3.73s) + prop_isomorphic_shellEscape_multiword: OK (2.86s) +++ OK, passed 1000 tests. - prop_isomorphic_configEscape: OK (0.12s) + prop_isomorphic_configEscape: OK (0.07s) +++ OK, passed 1000 tests. - prop_parse_show_Config: OK (0.13s) + prop_parse_show_Config: OK (0.15s) +++ OK, passed 1000 tests. prop_upFrom_basics: OK (0.05s) +++ OK, passed 1000 tests. - prop_relPathDirToFile_basics: OK (0.12s) + prop_relPathDirToFile_basics: OK (0.09s) +++ OK, passed 1000 tests. prop_relPathDirToFile_regressionTest: OK +++ OK, passed 1 tests. @@ -3929,15 +3963,15 @@ +++ OK, passed 1 tests. prop_addMapLog_sane: OK +++ OK, passed 1 tests. - prop_verifiable_sane: OK (0.22s) + prop_verifiable_sane: OK (0.26s) +++ OK, passed 1000 tests. prop_segment_regressionTest: OK +++ OK, passed 1 tests. - prop_read_write_transferinfo: OK (0.10s) + prop_read_write_transferinfo: OK (0.13s) +++ OK, passed 1000 tests. - prop_read_show_inodecache: OK (0.05s) + prop_read_show_inodecache: OK (0.06s) +++ OK, passed 1000 tests. - prop_parse_build_log: OK (4.40s) + prop_parse_build_log: OK (4.68s) +++ OK, passed 1000 tests. prop_read_show_TrustLevel: OK +++ OK, passed 1 tests. @@ -3947,71 +3981,71 @@ +++ OK, passed 1 tests. prop_mac_stable: OK +++ OK, passed 1 tests. - prop_schedule_roundtrips: OK (0.02s) + prop_schedule_roundtrips: OK (0.03s) +++ OK, passed 1000 tests. prop_past_sane: OK +++ OK, passed 1 tests. - prop_duration_roundtrips: OK + prop_duration_roundtrips: OK (0.03s) +++ OK, passed 1000 tests. - prop_metadata_sane: OK (11.02s) + prop_metadata_sane: OK (12.88s) +++ OK, passed 1000 tests. - prop_metadata_serialize: OK (10.91s) + prop_metadata_serialize: OK (15.06s) +++ OK, passed 1000 tests. - prop_branchView_legal: OK (3.95s) + prop_branchView_legal: OK (3.84s) +++ OK, passed 1000 tests. - prop_viewPath_roundtrips: OK (0.11s) + prop_viewPath_roundtrips: OK (0.13s) +++ OK, passed 1000 tests. - prop_view_roundtrips: OK (2.57s) + prop_view_roundtrips: OK (2.44s) +++ OK, passed 1000 tests. - prop_viewedFile_rountrips: OK (0.05s) + prop_viewedFile_rountrips: OK (0.03s) +++ OK, passed 1000 tests. - prop_b64_roundtrips: OK (0.01s) + prop_b64_roundtrips: OK (0.02s) +++ OK, passed 1000 tests. prop_standardGroups_parse: OK +++ OK, passed 1 tests. Unit Tests v5 add dup: Init Tests - init: OK (0.57s) - add: OK (1.21s) + init: OK (0.35s) + add: OK (0.86s) -All 2 tests passed (1.78s) -OK (0.32s) - add extras: OK (0.23s) - shared clone: OK (0.15s) - log: + Fri, 27 May 2022 09:24:04 -12 foo | 054d0cb2-aa58-44c1-bac8-7ced3fbe2c68 -- test repo [origin] -OK (0.19s) +All 2 tests passed (1.21s) +OK (1.22s) + add extras: OK (0.94s) + shared clone: OK (0.56s) + log: + Sun, 25 Apr 2021 05:50:42 +14 foo | f6946484-0ff9-4eb3-9672-b143213a2cf0 -- test repo [origin] +OK (0.68s) import: Could not verify that the content is still present in the annex; not removing from the import location. -OK (1.32s) - reinject: OK (0.93s) - unannex (no copy): OK (0.33s) - unannex (with copy): OK (0.75s) - drop (no remote): OK (0.77s) +OK (2.46s) + reinject: OK (1.62s) + unannex (no copy): OK (1.61s) + unannex (with copy): OK (1.77s) + drop (no remote): OK (2.81s) drop (with remote): numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) -OK (0.70s) - drop (untrusted remote): OK (0.44s) - get: OK (1.38s) - get (ssh remote): OK (1.91s) - move: OK (6.06s) - move (ssh remote): OK (9.89s) - copy: OK (4.77s) +OK (2.41s) + drop (untrusted remote): OK (1.46s) + get: OK (1.80s) + get (ssh remote): OK (1.79s) + move: OK (4.48s) + move (ssh remote): OK (6.68s) + copy: OK (4.01s) lock: content not present; cannot unlock this has not yet been committed to git; cannot unlock it 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) drop: 1 failed -OK (12.66s) +OK (3.29s) lock (v7 --force): 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) -OK (2.23s) +OK (2.11s) edit (no pre-commit): add foo ok ok (recording state in git...) -OK (1.80s) - edit (pre-commit): OK (4.22s) +OK (2.30s) + edit (pre-commit): OK (2.00s) partial commit: 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 (2.19s) - fix: OK (1.79s) +OK (1.15s) + fix: OK (1.87s) direct: On branch master Your branch is up to date with 'origin/master'. @@ -4022,8 +4056,8 @@ typechange: foo no changes added to commit -OK (7.10s) - trust: OK (3.85s) +OK (2.18s) + trust: OK (3.10s) fsck (basics): numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo @@ -4034,43 +4068,43 @@ (recording state in git...) foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa -OK (7.05s) - fsck (bare): OK (0.78s) +OK (3.33s) + fsck (bare): OK (0.76s) fsck (local untrusted): Only these untrusted locations may have copies of foo - 054d0cb2-aa58-44c1-bac8-7ced3fbe2c68 -- test repo [origin] - c11175e6-bcea-41e6-b06f-bb3c0d88bb21 -- .t/tmprepo26 [here] + 51df4267-8f69-4826-808d-649855c0726c -- .t/tmprepo26 [here] + f6946484-0ff9-4eb3-9672-b143213a2cf0 -- test repo [origin] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo - 054d0cb2-aa58-44c1-bac8-7ced3fbe2c68 -- test repo [origin] + f6946484-0ff9-4eb3-9672-b143213a2cf0 -- test repo [origin] Back it up to trusted locations with git-annex copy. -OK (2.06s) +OK (1.95s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: - 054d0cb2-aa58-44c1-bac8-7ced3fbe2c68 -- test repo [origin] + f6946484-0ff9-4eb3-9672-b143213a2cf0 -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: - 054d0cb2-aa58-44c1-bac8-7ced3fbe2c68 -- test repo [origin] -OK (2.16s) - fsck --from remote: OK (0.90s) - migrate: OK (3.72s) - migrate (via gitattributes): OK (4.98s) + f6946484-0ff9-4eb3-9672-b143213a2cf0 -- test repo [origin] +OK (1.95s) + fsck --from remote: OK (0.93s) + migrate: OK (4.01s) + migrate (via gitattributes): OK (4.12s) unused: git-annex: 10 not valid (run git annex unused for list) git-annex: 501 not valid (run git annex unused for list) -OK (4.26s) - describe: OK (0.87s) +OK (3.95s) + describe: OK (0.74s) find: foo foo sha1foo sha1foo dir/subfile -OK (6.39s) - merge: OK (3.35s) - info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":false,"uuid":"054d0cb2-aa58-44c1-bac8-7ced3fbe2c68","description":"test repo [origin]"},{"here":true,"uuid":"f86c231f-5294-44b4-8247-f31c2b56d91b","description":".t/tmprepo35"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"156.43 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} -OK (1.61s) +OK (3.41s) + merge: OK (0.58s) + info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"d76b5c1f-3124-4001-a914-88bbf131b17e","description":".t/tmprepo35"},{"here":false,"uuid":"f6946484-0ff9-4eb3-9672-b143213a2cf0","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"185.62 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} +OK (0.38s) version: git-annex version: 7.20190129 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.20 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.0.0 ghc-8.4.4 http-client-0.5.13.1 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 @@ -4080,7 +4114,7 @@ supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 -OK (2.96s) +OK (0.14s) sync: On branch master Your branch is up to date with 'origin/master'. @@ -4096,15 +4130,15 @@ nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo - 62976b4..46c0f5f git-annex -> synced/git-annex + f643d56..b4c16c3 git-annex -> synced/git-annex foo On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo - 46c0f5f..7dc528f git-annex -> synced/git-annex -OK (12.60s) + b4c16c3..359e154 git-annex -> synced/git-annex +OK (3.07s) union merge regression: On branch master nothing to commit, working tree clean From ../../.t/tmprepo39 @@ -4144,20 +4178,20 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo40 - cf674b6..c5ec108 git-annex -> r3/git-annex + 591860c..d71038e git-annex -> r3/git-annex From ../../.t/tmprepo39 - cf674b6..3cbf165 git-annex -> r2/git-annex + 591860c..c0ba3fc git-annex -> r2/git-annex To ../../.t/tmprepo40 * [new branch] git-annex -> synced/git-annex To ../../.t/tmprepo39 - cf674b6..7a59222 git-annex -> synced/git-annex -OK (11.45s) - adjusted branch merge regression: OK (1.27s) - adjusted branch subtree regression: OK (0.65s) - conflict resolution: [master 37b1289] git-annex in .t/tmprepo44 + 591860c..c98acad git-annex -> synced/git-annex +OK (9.13s) + adjusted branch merge regression: OK (1.17s) + adjusted branch subtree regression: OK (0.63s) + conflict resolution: [master 69736e8] git-annex in .t/tmprepo44 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master b338bc7] git-annex in .t/tmprepo45 +[master b99780f] git-annex in .t/tmprepo45 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4170,14 +4204,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 6aaaef0] git-annex automatic merge conflict fix +[master 08cfaf4] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo45 - b338bc7..6aaaef0 master -> synced/master + b99780f..08cfaf4 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating b338bc7..6aaaef0 +Updating b99780f..08cfaf4 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + @@ -4191,17 +4225,17 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo45 - b338bc7..6aaaef0 master -> r2/master + b99780f..08cfaf4 master -> r2/master conflictor.variant-75dc conflictor.variant-a507 conflictor.variant-a507 conflictor.variant-75dc -OK (9.93s) - conflict resolution (adjusted branch): OK (1.30s) +OK (5.84s) + conflict resolution (adjusted branch): OK (1.18s) conflict resolution movein regression: add foo ok ok (recording state in git...) -[master dd8ba9f] git-annex in .t/tmprepo48 +[master 664d141] git-annex in .t/tmprepo48 1 file changed, 1 insertion(+), 1 deletion(-) From ../../.t/tmprepo49 * [new branch] git-annex -> r2/git-annex @@ -4212,23 +4246,23 @@ add foo ok ok (recording state in git...) -[master adacb6a] git-annex in .t/tmprepo49 +[master a5281ea] git-annex in .t/tmprepo49 1 file changed, 1 insertion(+), 1 deletion(-) Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge -[master 3055ee8] git-annex automatic merge conflict fix +[master f8fc685] git-annex automatic merge conflict fix From ../../.t/tmprepo48 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master To ../../.t/tmprepo48 - dd8ba9f..3055ee8 master -> synced/master + 664d141..f8fc685 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating dd8ba9f..3055ee8 +Updating 664d141..f8fc685 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + @@ -4236,14 +4270,14 @@ rename foo => foo.variant-0b0e (100%) create mode 120000 foo.variant-bc25 From ../../.t/tmprepo49 - 2d649b2..ca00c35 git-annex -> r2/git-annex - f7589e7..3055ee8 master -> r2/master - dd8ba9f..3055ee8 synced/master -> r2/synced/master -OK (14.46s) - conflict resolution (mixed directory and file): [master 21ef478] git-annex in .t/tmprepo50 + 3fd395b..f9e848d git-annex -> r2/git-annex + c44ccc5..f8fc685 master -> r2/master + 664d141..f8fc685 synced/master -> r2/synced/master +OK (6.36s) + conflict resolution (mixed directory and file): [master 9b673e8] git-annex in .t/tmprepo50 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 5bd13b7] git-annex in .t/tmprepo51 +[master 13109d9] git-annex in .t/tmprepo51 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile On branch master @@ -4256,14 +4290,14 @@ 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 -[master afc9b8b] git-annex automatic merge conflict fix +[master d0866e3] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo51 - 5bd13b7..afc9b8b master -> synced/master + 13109d9..d0866e3 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 5bd13b7..afc9b8b +Updating 13109d9..d0866e3 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -4276,10 +4310,10 @@ conflictor.variant-cc12 conflictor/subfile conflictor.variant-cc12 -[master ed521f7] git-annex in .t/tmprepo52 +[master 397bb8a] git-annex in .t/tmprepo52 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 389ead0] git-annex in .t/tmprepo53 +[master 8ad1ba1] git-annex in .t/tmprepo53 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile On branch master @@ -4292,14 +4326,14 @@ 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 -[master 60a372a] git-annex automatic merge conflict fix +[master c32d554] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo52 - ed521f7..60a372a master -> synced/master + 397bb8a..c32d554 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating ed521f7..60a372a +Updating 397bb8a..c32d554 Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + @@ -4314,48 +4348,48 @@ conflictor.variant-cc12 conflictor/subfile conflictor.variant-cc12 -OK (12.62s) - conflict resolution symlink bit: [master 7b1aa72] git-annex in .t/tmprepo54 +OK (10.80s) + conflict resolution symlink bit: [master 6cc32ac] git-annex in .t/tmprepo54 1 file changed, 1 insertion(+) create mode 120000 conflictor To /build/git-annex-7.20190129/.t/repo - 7dc528f..c2b6f55 git-annex -> synced/git-annex - f7589e7..7b1aa72 master -> synced/master + 359e154..f5b2cb4 git-annex -> synced/git-annex + c44ccc5..6cc32ac master -> synced/master conflictor -[master ff656fa] git-annex in .t/tmprepo55 +[master 308f23f] git-annex in .t/tmprepo55 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile From /build/git-annex-7.20190129/.t/repo - 7dc528f..c2b6f55 git-annex -> origin/git-annex - 7dc528f..c2b6f55 synced/git-annex -> origin/synced/git-annex - f7589e7..7b1aa72 synced/master -> origin/synced/master + 359e154..f5b2cb4 git-annex -> origin/git-annex + 359e154..f5b2cb4 synced/git-annex -> origin/synced/git-annex + c44ccc5..6cc32ac 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 -[master 739ef54] git-annex automatic merge conflict fix +[master ac627a4] git-annex automatic merge conflict fix To /build/git-annex-7.20190129/.t/repo - c2b6f55..c16ee7a git-annex -> synced/git-annex - 7b1aa72..739ef54 master -> synced/master + f5b2cb4..166dbec git-annex -> synced/git-annex + 6cc32ac..ac627a4 master -> synced/master conflictor/subfile -[master 7d00aa8] git-annex in .t/tmprepo56 +[master 978c3d2] git-annex in .t/tmprepo56 1 file changed, 1 insertion(+) create mode 120000 conflictor From /build/git-annex-7.20190129/.t/repo - 7dc528f..c16ee7a git-annex -> origin/git-annex - 7dc528f..c16ee7a synced/git-annex -> origin/synced/git-annex - f7589e7..739ef54 synced/master -> origin/synced/master + 359e154..166dbec git-annex -> origin/git-annex + 359e154..166dbec synced/git-annex -> origin/synced/git-annex + c44ccc5..ac627a4 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 -[master b8d3bab] git-annex automatic merge conflict fix +[master cad9a01] git-annex automatic merge conflict fix To /build/git-annex-7.20190129/.t/repo - c16ee7a..72d6721 git-annex -> synced/git-annex - 739ef54..b8d3bab master -> synced/master + 166dbec..9682dff git-annex -> synced/git-annex + ac627a4..cad9a01 master -> synced/master conflictor/subfile -OK (14.42s) - conflict resolution (uncommitted local file): [master afaf251] git-annex in .t/tmprepo57 +OK (7.18s) + conflict resolution (uncommitted local file): [master e69b6b4] git-annex in .t/tmprepo57 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4371,12 +4405,12 @@ conflictor Please move or remove them before you merge. Aborting -Updating f7589e7..afaf251 +Updating c44ccc5..e69b6b4 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting -Updating f7589e7..afaf251 +Updating c44ccc5..e69b6b4 To ../../.t/tmprepo57 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) @@ -4393,7 +4427,7 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. -[master a1fed7f] git-annex in .t/tmprepo59 +[master dd8747c] git-annex in .t/tmprepo59 1 file changed, 1 insertion(+) create mode 120000 conflictor/file On branch master @@ -4409,12 +4443,12 @@ conflictor Please move or remove them before you merge. Aborting -Updating f7589e7..a1fed7f +Updating c44ccc5..dd8747c error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting -Updating f7589e7..a1fed7f +Updating c44ccc5..dd8747c To ../../.t/tmprepo59 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) @@ -4431,8 +4465,8 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. -OK (11.14s) - conflict resolution (removed file): [master 2fdca03] git-annex in .t/tmprepo61 +OK (5.22s) + conflict resolution (removed file): [master a429521] git-annex in .t/tmprepo61 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4441,7 +4475,7 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -Updating f7589e7..2fdca03 +Updating c44ccc5..a429521 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) @@ -4449,7 +4483,7 @@ Already up to date. To ../../.t/tmprepo61 * [new branch] git-annex -> synced/git-annex -[master dacf5fa] git-annex in .t/tmprepo61 +[master d488528] git-annex in .t/tmprepo61 1 file changed, 1 deletion(-) delete mode 120000 conflictor From ../../.t/tmprepo62 @@ -4457,36 +4491,36 @@ * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo62 - 2fdca03..dacf5fa master -> synced/master + a429521..d488528 master -> synced/master * [new branch] git-annex -> synced/git-annex add conflictor ok ok (recording state in git...) -[master c43dffd] git-annex in .t/tmprepo62 +[master 56d448d] git-annex in .t/tmprepo62 1 file changed, 1 insertion(+), 1 deletion(-) 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 -[master deb35d8] git-annex automatic merge conflict fix +[master 03fd869] git-annex automatic merge conflict fix From ../../.t/tmprepo61 - eabe5c1..846e394 git-annex -> r1/git-annex - 2fdca03..dacf5fa master -> r1/master - 2fdca03..dacf5fa synced/master -> r1/synced/master + cc8cc33..18dc40e git-annex -> r1/git-annex + a429521..d488528 master -> r1/master + a429521..d488528 synced/master -> r1/synced/master To ../../.t/tmprepo61 - eabe5c1..cdfc627 git-annex -> synced/git-annex - dacf5fa..deb35d8 master -> synced/master + cc8cc33..72ff52f git-annex -> synced/git-annex + d488528..03fd869 master -> synced/master On branch master nothing to commit, working tree clean -Updating dacf5fa..deb35d8 +Updating d488528..03fd869 Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 120000 conflictor.variant-0cbf From ../../.t/tmprepo62 - 846e394..cdfc627 git-annex -> r2/git-annex - 2fdca03..deb35d8 master -> r2/master - dacf5fa..deb35d8 synced/master -> r2/synced/master -[master 969f8e2] git-annex in .t/tmprepo63 + 18dc40e..72ff52f git-annex -> r2/git-annex + a429521..03fd869 master -> r2/master + d488528..03fd869 synced/master -> r2/synced/master +[master 862e201] git-annex in .t/tmprepo63 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4495,7 +4529,7 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -Updating f7589e7..969f8e2 +Updating c44ccc5..862e201 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) @@ -4506,40 +4540,40 @@ add conflictor ok ok (recording state in git...) -[master 6c8782a] git-annex in .t/tmprepo64 +[master acafd0e] git-annex in .t/tmprepo64 1 file changed, 1 insertion(+), 1 deletion(-) To ../../.t/tmprepo63 - 025acec..a984a5e git-annex -> synced/git-annex - 969f8e2..6c8782a master -> synced/master -[master ee0a03a] git-annex in .t/tmprepo63 + fc171f7..5b03c1e git-annex -> synced/git-annex + 862e201..acafd0e master -> synced/master +[master 4105590] git-annex in .t/tmprepo63 1 file changed, 1 deletion(-) delete mode 120000 conflictor 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 -[master a576d9e] git-annex automatic merge conflict fix +[master 53f5966] git-annex automatic merge conflict fix From ../../.t/tmprepo64 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo64 - 6c8782a..a576d9e master -> synced/master + acafd0e..53f5966 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 6c8782a..a576d9e +Updating acafd0e..53f5966 Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) From ../../.t/tmprepo63 - 969f8e2..a576d9e master -> r1/master - 6c8782a..a576d9e synced/master -> r1/synced/master -OK (20.93s) - conflict resolution (nonannexed file): [master b020034] git-annex in .t/tmprepo65 + 862e201..53f5966 master -> r1/master + acafd0e..53f5966 synced/master -> r1/synced/master +OK (11.87s) + conflict resolution (nonannexed file): [master 89e3cc5] git-annex in .t/tmprepo65 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master cb4d937] git-annex in .t/tmprepo66 +[master b3ef5ec] git-annex in .t/tmprepo66 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -4551,14 +4585,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 48bff3a] git-annex automatic merge conflict fix +[master 7562aa6] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo66 - cb4d937..48bff3a master -> synced/master + b3ef5ec..7562aa6 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating cb4d937..48bff3a +Updating b3ef5ec..7562aa6 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -4567,10 +4601,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master 3fdaa28] git-annex in .t/tmprepo67 +[master ea631ad] git-annex in .t/tmprepo67 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 972e788] git-annex in .t/tmprepo68 +[master 47b3225] git-annex in .t/tmprepo68 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -4582,14 +4616,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master ddfe2e6] git-annex automatic merge conflict fix +[master d01975a] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo67 - 3fdaa28..ddfe2e6 master -> synced/master + ea631ad..d01975a master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 3fdaa28..ddfe2e6 +Updating ea631ad..d01975a Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -4600,10 +4634,10 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -[master e35b530] git-annex in .t/tmprepo69 +[master 3c83ba2] git-annex in .t/tmprepo69 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 667fbb4] git-annex in .t/tmprepo70 +[master b5fd53d] git-annex in .t/tmprepo70 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -4616,7 +4650,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo70 - 667fbb4..0f86018 annex/direct/master -> synced/master + b5fd53d..bd3697d annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean @@ -4626,14 +4660,14 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -error: duplicate parent 0f860189a12e13ca751630650473fa8a127d3cea ignored +error: duplicate parent bd3697d5bbac70a84ef8b0f67c0c4fd8e50e6b95 ignored To ../../.t/tmprepo69 - 0f86018..008e329 annex/direct/master -> synced/master + bd3697d..5437856 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex -[master a825dc9] git-annex in .t/tmprepo71 +[master d3d76f2] git-annex in .t/tmprepo71 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 43f099e] git-annex in .t/tmprepo72 +[master c685747] git-annex in .t/tmprepo72 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -4646,7 +4680,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo71 - a825dc9..1f56cc9 annex/direct/master -> synced/master + d3d76f2..a169c9d annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean @@ -4656,15 +4690,15 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -error: duplicate parent 1f56cc917c1553262e16be15926908b94f1fd8dc ignored +error: duplicate parent a169c9dc6f56f423bdf4b15e5d4ca0b854d39ac2 ignored To ../../.t/tmprepo72 - 1f56cc9..e65ed59 annex/direct/master -> synced/master + a169c9d..9473bab annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex -OK (28.50s) - conflict resolution (nonannexed symlink): [master a297742] git-annex in .t/tmprepo73 +OK (19.56s) + conflict resolution (nonannexed symlink): [master 5665b72] git-annex in .t/tmprepo73 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 893a388] git-annex in .t/tmprepo74 +[master 71ee11e] git-annex in .t/tmprepo74 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4677,14 +4711,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master bfaa42f] git-annex automatic merge conflict fix +[master 2a7d983] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo74 - 893a388..bfaa42f master -> synced/master + 71ee11e..2a7d983 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 893a388..bfaa42f +Updating 71ee11e..2a7d983 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -4693,10 +4727,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master f84a2ad] git-annex in .t/tmprepo75 +[master db5e872] git-annex in .t/tmprepo75 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 2699129] git-annex in .t/tmprepo76 +[master a5484e0] git-annex in .t/tmprepo76 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4709,14 +4743,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 07b5340] git-annex automatic merge conflict fix +[master c55a119] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo75 - f84a2ad..07b5340 master -> synced/master + db5e872..c55a119 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating f84a2ad..07b5340 +Updating db5e872..c55a119 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -4726,10 +4760,10 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -[master e6026f4] git-annex in .t/tmprepo77 +[master 6686891] git-annex in .t/tmprepo77 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master e369295] git-annex in .t/tmprepo78 +[master 88f951b] git-annex in .t/tmprepo78 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4743,7 +4777,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo78 - e369295..0851c13 annex/direct/master -> synced/master + 88f951b..01666f1 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean @@ -4753,14 +4787,14 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -error: duplicate parent 0851c13f4306e8275c8c1949e6be68c017dc26ad ignored +error: duplicate parent 01666f1c260aadfab9f330ae24a96bd46a5698df ignored To ../../.t/tmprepo77 - 0851c13..a42ab47 annex/direct/master -> synced/master + 01666f1..1dc4860 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex -[master 1475e70] git-annex in .t/tmprepo79 +[master 2f7bbd9] git-annex in .t/tmprepo79 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master c613243] git-annex in .t/tmprepo80 +[master c2b4e23] git-annex in .t/tmprepo80 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -4774,7 +4808,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo79 - 1475e70..f2f4053 annex/direct/master -> synced/master + 2f7bbd9..834161d annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean @@ -4784,11 +4818,11 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -error: duplicate parent f2f40532553aed25915e6b7490fd74c4428f6b5e ignored +error: duplicate parent 834161dba41139600230d046bcf094940ac28ad5 ignored To ../../.t/tmprepo80 - f2f4053..b05b25a annex/direct/master -> synced/master + 834161d..ebcad78 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex -OK (24.15s) +OK (10.06s) conflict resolution (mixed locked and unlocked file): On branch master Your branch is up to date with 'origin/master'. @@ -4796,7 +4830,7 @@ From ../../.t/tmprepo82 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master -Updating f7589e7..b8d3bab +Updating c44ccc5..cad9a01 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + @@ -4807,12 +4841,12 @@ * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master To /build/git-annex-7.20190129/.t/repo - 72d6721..12858e6 git-annex -> synced/git-annex + 9682dff..4e08d32 git-annex -> synced/git-annex On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean -Updating f7589e7..b8d3bab +Updating c44ccc5..cad9a01 Fast-forward conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + @@ -4824,35 +4858,35 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master From /build/git-annex-7.20190129/.t/repo - 72d6721..12858e6 git-annex -> origin/git-annex - 72d6721..12858e6 synced/git-annex -> origin/synced/git-annex + 9682dff..4e08d32 git-annex -> origin/git-annex + 9682dff..4e08d32 synced/git-annex -> origin/synced/git-annex 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 From ../../.t/tmprepo82 - f7589e7..b8d3bab master -> r2/master -OK (6.84s) - map: OK (1.18s) - uninit: Deleted branch git-annex (was ab19a27). + c44ccc5..cad9a01 master -> r2/master +OK (1.35s) + map: OK (0.24s) + uninit: Deleted branch git-annex (was dc7ac93). ExitSuccess -OK (2.22s) +OK (0.31s) uninit (in git-annex branch): Switched to branch 'git-annex' -OK (0.90s) - upgrade: OK (0.92s) - whereis: OK (2.06s) - hook remote: OK (3.72s) - directory remote: OK (5.79s) - rsync remote: OK (4.47s) - bup remote: OK (0.61s) +OK (0.21s) + upgrade: OK (0.18s) + whereis: OK (0.42s) + hook remote: OK (0.69s) + directory remote: OK (0.64s) + rsync remote: OK (0.90s) + bup remote: OK (0.14s) crypto: git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed -OK (27.37s) +OK (5.86s) preferred content: wanted . ok (recording state in git...) group . ok @@ -4863,8 +4897,8 @@ (recording state in git...) wanted . ok (recording state in git...) -OK (8.14s) - add subdirs: [master 0e139b1] git-annex in .t/tmprepo96 +OK (1.44s) + add subdirs: [master 2d7bc27] git-annex in .t/tmprepo96 1 file changed, 1 insertion(+) create mode 120000 dir/foo Merge made by the 'recursive' strategy. @@ -4874,54 +4908,54 @@ create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile To /build/git-annex-7.20190129/.t/repo - 12858e6..bb70e44 git-annex -> synced/git-annex - b8d3bab..86b4d62 master -> synced/master -OK (3.66s) + 4e08d32..b3934da git-annex -> synced/git-annex + cad9a01..e6f1522 master -> synced/master +OK (0.82s) addurl: Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo97/myurl download failed: Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo97/myurl -OK (1.79s) +OK (0.59s) Unit Tests v7 locked add dup: Init Tests - init: OK (0.72s) - add: OK (2.22s) + init: OK (0.19s) + add: OK (0.71s) -All 2 tests passed (2.94s) -OK (1.95s) - add extras: OK (1.54s) - shared clone: OK (1.22s) - log: + Fri, 27 May 2022 09:29:47 -12 foo | 4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e -- test repo [origin] -OK (1.39s) +All 2 tests passed (0.91s) +OK (0.65s) + add extras: OK (0.43s) + shared clone: OK (0.24s) + log: + Sun, 25 Apr 2021 05:53:49 +14 foo | 77dab437-3b56-4d09-94f9-a036d1c7a47a -- test repo [origin] +OK (0.22s) import: Could not verify that the content is still present in the annex; not removing from the import location. -OK (3.89s) - reinject: OK (3.02s) - unannex (no copy): OK (1.76s) - unannex (with copy): OK (5.97s) - drop (no remote): OK (5.23s) +OK (0.91s) + reinject: OK (0.67s) + unannex (no copy): OK (0.31s) + unannex (with copy): OK (0.44s) + drop (no remote): OK (0.54s) drop (with remote): numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) -OK (3.18s) - drop (untrusted remote): OK (3.41s) - get: OK (3.23s) - get (ssh remote): OK (5.89s) - move: OK (5.26s) - move (ssh remote): OK (5.69s) - copy: OK (4.45s) +OK (0.70s) + drop (untrusted remote): OK (0.48s) + get: OK (0.56s) + get (ssh remote): OK (0.57s) + move: OK (0.91s) + move (ssh remote): OK (1.03s) + copy: OK (0.78s) lock: 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) drop: 1 failed -OK (4.56s) +OK (1.23s) lock (v7 --force): 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) -OK (2.94s) +OK (0.68s) edit (no pre-commit): (recording state in git...) -OK (12.66s) - edit (pre-commit): OK (10.59s) +OK (0.62s) + edit (pre-commit): OK (0.64s) partial commit: (recording state in git...) -OK (4.11s) - fix: OK (3.28s) +OK (0.78s) + fix: OK (0.70s) direct: git-annex: Direct mode is not supported by this repository version. Use git-annex unlock instead. -OK (2.58s) - trust: OK (5.79s) +OK (0.47s) + trust: OK (0.67s) fsck (basics): numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo @@ -4932,43 +4966,43 @@ (recording state in git...) foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 sha1foo: Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa -OK (5.27s) - fsck (bare): OK (0.87s) +OK (0.81s) + fsck (bare): OK (0.17s) fsck (local untrusted): Only these untrusted locations may have copies of foo - 4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e -- test repo [origin] - e6f0727d-ed34-4aba-9422-af1dddbb7296 -- .t/tmprepo124 [here] + 77dab437-3b56-4d09-94f9-a036d1c7a47a -- test repo [origin] + fc5a43c4-2e8a-489f-b3d2-54172e8a6f7e -- .t/tmprepo124 [here] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo - 4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e -- test repo [origin] + 77dab437-3b56-4d09-94f9-a036d1c7a47a -- test repo [origin] Back it up to trusted locations with git-annex copy. -OK (2.70s) +OK (0.54s) fsck (remote untrusted): numcopies 2 ok (recording state in git...) Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: - 4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e -- test repo [origin] + 77dab437-3b56-4d09-94f9-a036d1c7a47a -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: - 4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e -- test repo [origin] -OK (3.17s) - fsck --from remote: OK (1.85s) - migrate: OK (5.64s) - migrate (via gitattributes): OK (5.17s) + 77dab437-3b56-4d09-94f9-a036d1c7a47a -- test repo [origin] +OK (0.53s) + fsck --from remote: OK (0.25s) + migrate: OK (1.09s) + migrate (via gitattributes): OK (1.05s) unused: git-annex: 10 not valid (run git annex unused for list) git-annex: 501 not valid (run git annex unused for list) -OK (32.12s) - describe: OK (3.64s) +OK (1.45s) + describe: OK (0.31s) find: foo foo sha1foo sha1foo dir/subfile -OK (17.42s) - merge: OK (1.47s) - info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":false,"uuid":"4c59e96c-1ed2-4b0c-8cd2-4fc54caa2d7e","description":"test repo [origin]"},{"here":true,"uuid":"f175f9a4-b68e-4509-a354-eb4fa81d408f","description":".t/tmprepo133"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"153.01 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} -OK (2.02s) +OK (1.12s) + merge: OK (0.25s) + info: {"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"2142f529-c514-4bcc-8f0b-85176b8c01cf","description":".t/tmprepo133"},{"here":false,"uuid":"77dab437-3b56-4d09-94f9-a036d1c7a47a","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"indirect","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"186.1 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} +OK (0.29s) version: git-annex version: 7.20190129 build flags: Assistant Webapp Pairing S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite dependency versions: aws-0.20 bloomfilter-2.0.1.0 cryptonite-0.25 DAV-1.3.3 feed-1.0.0.0 ghc-8.4.4 http-client-0.5.13.1 persistent-sqlite-2.8.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.0 @@ -4978,7 +5012,7 @@ supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 7 -OK (1.10s) +OK (0.23s) sync: On branch master Your branch is up to date with 'origin/master'. @@ -4994,15 +5028,15 @@ nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo - ee25ec0..fd21540 git-annex -> synced/git-annex + 838450b..29653da git-annex -> synced/git-annex foo On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo - fd21540..72eb4a6 git-annex -> synced/git-annex -OK (8.40s) + 29653da..03f9acd git-annex -> synced/git-annex +OK (1.56s) union merge regression: On branch master nothing to commit, working tree clean From ../../.t/tmprepo137 @@ -5042,16 +5076,16 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo138 - 48026cc..b1e351c git-annex -> r3/git-annex + 80d8ce5..502e113 git-annex -> r3/git-annex From ../../.t/tmprepo137 - 48026cc..d87fc0e git-annex -> r2/git-annex + 80d8ce5..203216d git-annex -> r2/git-annex To ../../.t/tmprepo138 * [new branch] git-annex -> synced/git-annex To ../../.t/tmprepo137 - 48026cc..4a4adf2 git-annex -> synced/git-annex -OK (13.78s) + 80d8ce5..db291ee git-annex -> synced/git-annex +OK (2.80s) adjusted branch merge regression: Switched to branch 'adjusted/master(unlocked)' -[adjusted/master(unlocked) 2c074e0] git-annex in .t/tmprepo139 +[adjusted/master(unlocked) 57c087d] git-annex in .t/tmprepo139 1 file changed, 1 insertion(+) create mode 100644 conflictor From ../../.t/tmprepo140 @@ -5061,11 +5095,11 @@ * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master Switched to branch 'adjusted/master(unlocked)' -[adjusted/master(unlocked) f96e9f4] git-annex in .t/tmprepo140 +[adjusted/master(unlocked) 1e04cc7] git-annex in .t/tmprepo140 1 file changed, 1 insertion(+) create mode 100644 conflictor Merge made by the 'recursive' strategy. -Updating f96e9f4..dc672b7 +Updating 1e04cc7..3b00433 Fast-forward From ../../.t/tmprepo139 * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) @@ -5073,37 +5107,37 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master To ../../.t/tmprepo139 - 880e9aa..889e2d1 master -> synced/master + 9bc326e..21aaa1c master -> synced/master * [new branch] git-annex -> synced/git-annex On branch adjusted/master(unlocked) nothing to commit, working tree clean -Updating 880e9aa..889e2d1 +Updating 9bc326e..21aaa1c Fast-forward -Updating 6ba2edc..2b691df +Updating 5cff938..b3ab889 Fast-forward From ../../.t/tmprepo140 * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) - 504e865..c285403 git-annex -> r2/git-annex - a2c0758..889e2d1 master -> r2/master - 880e9aa..889e2d1 synced/master -> r2/synced/master + ade09b9..0fa96bb git-annex -> r2/git-annex + 4b05404..21aaa1c master -> r2/master + 9bc326e..21aaa1c synced/master -> r2/synced/master On branch adjusted/master(unlocked) nothing to commit, working tree clean From ../../.t/tmprepo139 - + 6ba2edc...f6b9be8 adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) -OK (14.99s) + + 5cff938...00c5cf7 adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) +OK (2.76s) adjusted branch subtree regression: Switched to branch 'adjusted/master(unlocked)' -[adjusted/master(unlocked) 17034c7] git-annex in .t/tmprepo141 +[adjusted/master(unlocked) 857ff17] git-annex in .t/tmprepo141 1 file changed, 1 insertion(+) create mode 100644 a/b/c/d -[adjusted/master(unlocked) 59154c1] git-annex in .t/tmprepo141 +[adjusted/master(unlocked) 31f3dbb] git-annex in .t/tmprepo141 1 file changed, 1 insertion(+) create mode 100644 a/b/x/y Switched to branch 'master' -OK (5.32s) - conflict resolution: [master 3eb9c93] git-annex in .t/tmprepo142 +OK (1.25s) + conflict resolution: [master dbd33b0] git-annex in .t/tmprepo142 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master f011e09] git-annex in .t/tmprepo143 +[master a51f35b] git-annex in .t/tmprepo143 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5116,14 +5150,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 0cbf1e5] git-annex automatic merge conflict fix +[master 3eef8f3] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo143 - f011e09..0cbf1e5 master -> synced/master + a51f35b..3eef8f3 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating f011e09..0cbf1e5 +Updating a51f35b..3eef8f3 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + @@ -5137,16 +5171,16 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo143 - f011e09..0cbf1e5 master -> r2/master + a51f35b..3eef8f3 master -> r2/master conflictor.variant-75dc conflictor.variant-a507 conflictor.variant-a507 conflictor.variant-75dc -OK (8.32s) - conflict resolution (adjusted branch): [master e9f71c3] git-annex in .t/tmprepo144 +OK (1.83s) + conflict resolution (adjusted branch): [master 4bad0f7] git-annex in .t/tmprepo144 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 4988279] git-annex in .t/tmprepo145 +[master 651e204] git-annex in .t/tmprepo145 1 file changed, 1 insertion(+) create mode 120000 conflictor Switched to branch 'adjusted/master(unlocked)' @@ -5161,21 +5195,21 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master f7fed50] git-annex automatic merge conflict fix +[master 5abba5a] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo145 - 4988279..f7fed50 master -> synced/master + 651e204..5abba5a master -> synced/master * [new branch] git-annex -> synced/git-annex On branch adjusted/master(unlocked) nothing to commit, working tree clean -Updating 4988279..f7fed50 +Updating 651e204..5abba5a 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 -Updating add9dcc..ece9f85 +Updating 701b332..7b279c8 Fast-forward conflictor => conflictor.variant-75dc | 0 conflictor.variant-a507 | 1 + @@ -5189,14 +5223,14 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo145 - + add9dcc...59392b8 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) + + 701b332...dcff5a2 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) conflictor.variant-75dc conflictor.variant-a507 conflictor.variant-75dc conflictor.variant-a507 -OK (20.28s) +OK (2.70s) conflict resolution movein regression: (recording state in git...) -[master 790fbcd] git-annex in .t/tmprepo146 +[master 4ffef63] git-annex in .t/tmprepo146 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 @@ -5207,7 +5241,7 @@ * [new branch] git-annex -> synced/git-annex * [new branch] master -> synced/master (recording state in git...) -[master 018e531] git-annex in .t/tmprepo147 +[master 6f8f5ab] git-annex in .t/tmprepo147 1 file changed, 1 insertion(+), 1 deletion(-) rewrite foo (100%) mode change 120000 => 100644 @@ -5215,17 +5249,17 @@ CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge -[master 7ea1711] git-annex automatic merge conflict fix +[master e92d452] git-annex automatic merge conflict fix From ../../.t/tmprepo146 * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master To ../../.t/tmprepo146 - 790fbcd..7ea1711 master -> synced/master + 4ffef63..e92d452 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 790fbcd..7ea1711 +Updating 4ffef63..e92d452 Fast-forward foo => foo.variant-0b0e | 0 foo.variant-bc25 | 1 + @@ -5233,14 +5267,14 @@ rename foo => foo.variant-0b0e (100%) create mode 100644 foo.variant-bc25 From ../../.t/tmprepo147 - af678f9..db8eaf2 git-annex -> r2/git-annex - a2c0758..7ea1711 master -> r2/master - 790fbcd..7ea1711 synced/master -> r2/synced/master -OK (10.95s) - conflict resolution (mixed directory and file): [master 236da80] git-annex in .t/tmprepo148 + 6132e79..bc7dc45 git-annex -> r2/git-annex + 4b05404..e92d452 master -> r2/master + 4ffef63..e92d452 synced/master -> r2/synced/master +OK (2.33s) + conflict resolution (mixed directory and file): [master 175912d] git-annex in .t/tmprepo148 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master a7a6b9f] git-annex in .t/tmprepo149 +[master 36a9801] git-annex in .t/tmprepo149 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile On branch master @@ -5253,14 +5287,14 @@ 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 -[master 09e75d9] git-annex automatic merge conflict fix +[master 6cdd4b3] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo149 - a7a6b9f..09e75d9 master -> synced/master + 36a9801..6cdd4b3 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating a7a6b9f..09e75d9 +Updating 36a9801..6cdd4b3 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -5273,10 +5307,10 @@ conflictor.variant-cc12 conflictor/subfile conflictor.variant-cc12 -[master 251e016] git-annex in .t/tmprepo150 +[master 292fc42] git-annex in .t/tmprepo150 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master c874b55] git-annex in .t/tmprepo151 +[master a9de75c] git-annex in .t/tmprepo151 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile On branch master @@ -5289,14 +5323,14 @@ 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 -[master 1792533] git-annex automatic merge conflict fix +[master 7fecd0f] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo150 - 251e016..1792533 master -> synced/master + 292fc42..7fecd0f master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 251e016..1792533 +Updating 292fc42..7fecd0f Fast-forward conflictor => conflictor.variant-cc12 | 0 conflictor/subfile | 1 + @@ -5311,48 +5345,48 @@ conflictor.variant-cc12 conflictor/subfile conflictor.variant-cc12 -OK (24.65s) - conflict resolution symlink bit: [master 72e9c61] git-annex in .t/tmprepo152 +OK (3.78s) + conflict resolution symlink bit: [master ea05fd5] git-annex in .t/tmprepo152 1 file changed, 1 insertion(+) create mode 120000 conflictor To /build/git-annex-7.20190129/.t/repo - 72eb4a6..74a2044 git-annex -> synced/git-annex - a2c0758..72e9c61 master -> synced/master + 03f9acd..da7ceb8 git-annex -> synced/git-annex + 4b05404..ea05fd5 master -> synced/master conflictor -[master 38db873] git-annex in .t/tmprepo153 +[master 296d90c] git-annex in .t/tmprepo153 1 file changed, 1 insertion(+) create mode 120000 conflictor/subfile From /build/git-annex-7.20190129/.t/repo - 72eb4a6..74a2044 git-annex -> origin/git-annex - 72eb4a6..74a2044 synced/git-annex -> origin/synced/git-annex - a2c0758..72e9c61 synced/master -> origin/synced/master + 03f9acd..da7ceb8 git-annex -> origin/git-annex + 03f9acd..da7ceb8 synced/git-annex -> origin/synced/git-annex + 4b05404..ea05fd5 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 -[master 82d4de2] git-annex automatic merge conflict fix +[master e5d794a] git-annex automatic merge conflict fix To /build/git-annex-7.20190129/.t/repo - 74a2044..ac5318e git-annex -> synced/git-annex - 72e9c61..82d4de2 master -> synced/master + da7ceb8..21f45e2 git-annex -> synced/git-annex + ea05fd5..e5d794a master -> synced/master conflictor/subfile -[master 21e581c] git-annex in .t/tmprepo154 +[master d3849ad] git-annex in .t/tmprepo154 1 file changed, 1 insertion(+) create mode 120000 conflictor From /build/git-annex-7.20190129/.t/repo - 72eb4a6..ac5318e git-annex -> origin/git-annex - 72eb4a6..ac5318e synced/git-annex -> origin/synced/git-annex - a2c0758..82d4de2 synced/master -> origin/synced/master + 03f9acd..21f45e2 git-annex -> origin/git-annex + 03f9acd..21f45e2 synced/git-annex -> origin/synced/git-annex + 4b05404..e5d794a 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 -[master 0b886bf] git-annex automatic merge conflict fix +[master e9c21aa] git-annex automatic merge conflict fix To /build/git-annex-7.20190129/.t/repo - ac5318e..7f0b8b2 git-annex -> synced/git-annex - 82d4de2..0b886bf master -> synced/master + 21f45e2..95fbb50 git-annex -> synced/git-annex + e5d794a..e9c21aa master -> synced/master conflictor/subfile -OK (40.96s) - conflict resolution (uncommitted local file): [master 4ff4707] git-annex in .t/tmprepo155 +OK (2.44s) + conflict resolution (uncommitted local file): [master dfcf790] git-annex in .t/tmprepo155 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5364,16 +5398,16 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master +Updating 4b05404..dfcf790 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting -Updating a2c0758..4ff4707 +Updating 4b05404..dfcf790 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting -Updating a2c0758..4ff4707 To ../../.t/tmprepo155 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) @@ -5390,7 +5424,7 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. -[master 3c77e6b] git-annex in .t/tmprepo157 +[master 2533e53] git-annex in .t/tmprepo157 1 file changed, 1 insertion(+) create mode 120000 conflictor/file On branch master @@ -5402,16 +5436,16 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -Updating a2c0758..3c77e6b error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting -Updating a2c0758..3c77e6b +Updating 4b05404..2533e53 error: The following untracked working tree files would be overwritten by merge: conflictor Please move or remove them before you merge. Aborting +Updating 4b05404..2533e53 To ../../.t/tmprepo157 * [new branch] git-annex -> synced/git-annex ! [rejected] master -> synced/master (non-fast-forward) @@ -5428,8 +5462,8 @@ hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Pushing to r1 failed. -OK (21.07s) - conflict resolution (removed file): [master bc24c5e] git-annex in .t/tmprepo159 +OK (2.27s) + conflict resolution (removed file): [master 774fd91] git-annex in .t/tmprepo159 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5438,7 +5472,7 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -Updating a2c0758..bc24c5e +Updating 4b05404..774fd91 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) @@ -5446,7 +5480,7 @@ Already up to date. To ../../.t/tmprepo159 * [new branch] git-annex -> synced/git-annex -[master 7fd136e] git-annex in .t/tmprepo159 +[master fb1b1dd] git-annex in .t/tmprepo159 1 file changed, 1 deletion(-) delete mode 120000 conflictor From ../../.t/tmprepo160 @@ -5454,36 +5488,36 @@ * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo160 - bc24c5e..7fd136e master -> synced/master + 774fd91..fb1b1dd master -> synced/master * [new branch] git-annex -> synced/git-annex (recording state in git...) -[master a951557] git-annex in .t/tmprepo160 +[master d695c96] git-annex in .t/tmprepo160 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 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 -[master 05199e9] git-annex automatic merge conflict fix +[master 6ff8d2f] git-annex automatic merge conflict fix From ../../.t/tmprepo159 - 8942bdc..ce37113 git-annex -> r1/git-annex - bc24c5e..7fd136e master -> r1/master - bc24c5e..7fd136e synced/master -> r1/synced/master + de2978c..6cb4f71 git-annex -> r1/git-annex + 774fd91..fb1b1dd master -> r1/master + 774fd91..fb1b1dd synced/master -> r1/synced/master To ../../.t/tmprepo159 - 8942bdc..b5f300d git-annex -> synced/git-annex - 7fd136e..05199e9 master -> synced/master + de2978c..4af9df1 git-annex -> synced/git-annex + fb1b1dd..6ff8d2f master -> synced/master On branch master nothing to commit, working tree clean -Updating 7fd136e..05199e9 +Updating fb1b1dd..6ff8d2f Fast-forward conflictor.variant-0cbf | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflictor.variant-0cbf From ../../.t/tmprepo160 - ce37113..b5f300d git-annex -> r2/git-annex - bc24c5e..05199e9 master -> r2/master - 7fd136e..05199e9 synced/master -> r2/synced/master -[master 57e0e48] git-annex in .t/tmprepo161 + 6cb4f71..4af9df1 git-annex -> r2/git-annex + 774fd91..6ff8d2f master -> r2/master + fb1b1dd..6ff8d2f synced/master -> r2/synced/master +[master 9ebc3d4] git-annex in .t/tmprepo161 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5492,7 +5526,7 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -Updating a2c0758..57e0e48 +Updating 4b05404..9ebc3d4 Fast-forward conflictor | 1 + 1 file changed, 1 insertion(+) @@ -5501,42 +5535,42 @@ To ../../.t/tmprepo161 * [new branch] git-annex -> synced/git-annex (recording state in git...) -[master 91de573] git-annex in .t/tmprepo162 +[master 23f5258] git-annex in .t/tmprepo162 1 file changed, 1 insertion(+), 1 deletion(-) rewrite conflictor (100%) mode change 120000 => 100644 To ../../.t/tmprepo161 - 9ed57c9..4e017f7 git-annex -> synced/git-annex - 57e0e48..91de573 master -> synced/master -[master 5157d92] git-annex in .t/tmprepo161 + ba045a7..4a38f1a git-annex -> synced/git-annex + 9ebc3d4..23f5258 master -> synced/master +[master da8089d] git-annex in .t/tmprepo161 1 file changed, 1 deletion(-) delete mode 120000 conflictor 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 -[master 1074a6b] git-annex automatic merge conflict fix +[master 6b67e8c] git-annex automatic merge conflict fix From ../../.t/tmprepo162 * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo162 - 91de573..1074a6b master -> synced/master + 23f5258..6b67e8c master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 91de573..1074a6b +Updating 23f5258..6b67e8c Fast-forward conflictor => conflictor.variant-0cbf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conflictor => conflictor.variant-0cbf (100%) From ../../.t/tmprepo161 - 57e0e48..1074a6b master -> r1/master - 91de573..1074a6b synced/master -> r1/synced/master -OK (41.17s) - conflict resolution (nonannexed file): [master f16cac6] git-annex in .t/tmprepo163 + 9ebc3d4..6b67e8c master -> r1/master + 23f5258..6b67e8c synced/master -> r1/synced/master +OK (4.56s) + conflict resolution (nonannexed file): [master 2d8fbc1] git-annex in .t/tmprepo163 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 8fb8355] git-annex in .t/tmprepo164 +[master be00186] git-annex in .t/tmprepo164 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -5548,14 +5582,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 9453aac] git-annex automatic merge conflict fix +[master 1ad5625] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo164 - 8fb8355..9453aac master -> synced/master + be00186..1ad5625 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 8fb8355..9453aac +Updating be00186..1ad5625 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -5564,10 +5598,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master caf80ed] git-annex in .t/tmprepo165 +[master 2a6ecd0] git-annex in .t/tmprepo165 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master b2cafe2] git-annex in .t/tmprepo166 +[master abb8ce6] git-annex in .t/tmprepo166 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -5579,14 +5613,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 3a0aca5] git-annex automatic merge conflict fix +[master 289cb8f] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo165 - caf80ed..3a0aca5 master -> synced/master + 2a6ecd0..289cb8f master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating caf80ed..3a0aca5 +Updating 2a6ecd0..289cb8f Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -5597,10 +5631,10 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -[master e609809] git-annex in .t/tmprepo167 +[master a07d81e] git-annex in .t/tmprepo167 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 9cb1d23] git-annex in .t/tmprepo168 +[master a877509] git-annex in .t/tmprepo168 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -5612,14 +5646,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 3edddf0] git-annex automatic merge conflict fix +[master 49a9dfc] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo168 - 9cb1d23..3edddf0 master -> synced/master + a877509..49a9dfc master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 9cb1d23..3edddf0 +Updating a877509..49a9dfc Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -5628,10 +5662,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master 5c36da8] git-annex in .t/tmprepo169 +[master aabd191] git-annex in .t/tmprepo169 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master b489603] git-annex in .t/tmprepo170 +[master d137b8b] git-annex in .t/tmprepo170 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -5643,14 +5677,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master a12b2f0] git-annex automatic merge conflict fix +[master d0bae61] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo169 - 5c36da8..a12b2f0 master -> synced/master + aabd191..d0bae61 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 5c36da8..a12b2f0 +Updating aabd191..d0bae61 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -5661,11 +5695,11 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -OK (86.54s) - conflict resolution (nonannexed symlink): [master 34c9cf5] git-annex in .t/tmprepo171 +OK (7.00s) + conflict resolution (nonannexed symlink): [master d37aaad] git-annex in .t/tmprepo171 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master a4ebf96] git-annex in .t/tmprepo172 +[master 8e05a94] git-annex in .t/tmprepo172 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5678,14 +5712,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 8aba990] git-annex automatic merge conflict fix +[master b48c772] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo172 - a4ebf96..8aba990 master -> synced/master + 8e05a94..b48c772 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating a4ebf96..8aba990 +Updating 8e05a94..b48c772 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -5694,10 +5728,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master 28ce539] git-annex in .t/tmprepo173 +[master 584843a] git-annex in .t/tmprepo173 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master 413622b] git-annex in .t/tmprepo174 +[master a1c8c5d] git-annex in .t/tmprepo174 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5710,14 +5744,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 080451b] git-annex automatic merge conflict fix +[master 3420abb] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo173 - 28ce539..080451b master -> synced/master + 584843a..3420abb master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 28ce539..080451b +Updating 584843a..3420abb Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -5727,10 +5761,10 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -[master 51a0bcb] git-annex in .t/tmprepo175 +[master addfc1e] git-annex in .t/tmprepo175 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master e07192c] git-annex in .t/tmprepo176 +[master 0ce1125] git-annex in .t/tmprepo176 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5743,14 +5777,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master 63b26da] git-annex automatic merge conflict fix +[master f739759] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo176 - e07192c..63b26da master -> synced/master + 0ce1125..f739759 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating e07192c..63b26da +Updating 0ce1125..f739759 Fast-forward conflictor.variant-cc12 | 1 + 1 file changed, 1 insertion(+) @@ -5759,10 +5793,10 @@ * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master -[master 2947ca9] git-annex in .t/tmprepo177 +[master 45e9556] git-annex in .t/tmprepo177 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master b71e2a9] git-annex in .t/tmprepo178 +[master 745bcdb] git-annex in .t/tmprepo178 1 file changed, 1 insertion(+) create mode 120000 conflictor On branch master @@ -5775,14 +5809,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge -[master dcdb9ec] git-annex automatic merge conflict fix +[master 6fd7752] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo177 - 2947ca9..dcdb9ec master -> synced/master + 45e9556..6fd7752 master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating 2947ca9..dcdb9ec +Updating 45e9556..6fd7752 Fast-forward conflictor | 2 +- conflictor.variant-cc12 | 1 + @@ -5792,11 +5826,11 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master -OK (32.05s) - conflict resolution (mixed locked and unlocked file): [master 1e7ba7c] git-annex in .t/tmprepo179 +OK (6.52s) + conflict resolution (mixed locked and unlocked file): [master 0f53745] git-annex in .t/tmprepo179 1 file changed, 1 insertion(+) create mode 120000 conflictor -[master df277ce] git-annex in .t/tmprepo180 +[master c164c8c] git-annex in .t/tmprepo180 1 file changed, 1 insertion(+) create mode 100644 conflictor On branch master @@ -5808,14 +5842,14 @@ CONFLICT (add/add): Merge conflict in conflictor Automatic merge failed; fix conflicts and then commit the result. git-annex: git status will show conflictor to be modified, since content availability has changed and git-annex was unable to update the index. This is only a cosmetic problem affecting git status; git add, git commit, etc won't be affected. To fix the git status display, you can run: git update-index -q --refresh conflictor -[master a325ad5] git-annex automatic merge conflict fix +[master 0e90d8f] git-annex automatic merge conflict fix Already up to date. To ../../.t/tmprepo180 - df277ce..a325ad5 master -> synced/master + c164c8c..0e90d8f master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean -Updating df277ce..a325ad5 +Updating c164c8c..0e90d8f Fast-forward From ../../.t/tmprepo179 * [new branch] git-annex -> r1/git-annex @@ -5824,29 +5858,29 @@ On branch master nothing to commit, working tree clean From ../../.t/tmprepo180 - df277ce..a325ad5 master -> r2/master + c164c8c..0e90d8f master -> r2/master conflictor conflictor -OK (11.64s) - map: OK (1.83s) - uninit: Deleted branch git-annex (was 5d19eb4). +OK (2.30s) + map: OK (0.33s) + uninit: Deleted branch git-annex (was be97ee2). ExitSuccess -OK (2.10s) +OK (0.49s) uninit (in git-annex branch): Switched to branch 'git-annex' -OK (3.74s) - upgrade: OK (1.36s) - whereis: OK (14.52s) - hook remote: OK (17.86s) - directory remote: OK (5.00s) - rsync remote: OK (14.73s) - bup remote: OK (1.46s) +OK (0.48s) + upgrade: OK (0.26s) + whereis: OK (0.55s) + hook remote: OK (0.78s) + directory remote: OK (0.79s) + rsync remote: OK (1.02s) + bup remote: OK (0.25s) crypto: git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed -OK (40.89s) +OK (6.05s) preferred content: wanted . ok (recording state in git...) group . ok @@ -5857,8 +5891,8 @@ (recording state in git...) wanted . ok (recording state in git...) -OK (28.98s) - add subdirs: [master 986b5f1] git-annex in .t/tmprepo194 +OK (1.30s) + add subdirs: [master 6f50970] git-annex in .t/tmprepo194 1 file changed, 1 insertion(+) create mode 120000 dir/foo Merge made by the 'recursive' strategy. @@ -5868,12 +5902,12 @@ create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile To /build/git-annex-7.20190129/.t/repo - 7f0b8b2..c547951 git-annex -> synced/git-annex - 0b886bf..8879558 master -> synced/master -OK (5.72s) + 95fbb50..fe34665 git-annex -> synced/git-annex + e9c21aa..5fde22f master -> synced/master +OK (0.95s) addurl: Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo195/myurl download failed: Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo195/myurl -OK (2.02s) +OK (0.50s) Unit Tests v5 direct add dup: Init Tests init: On branch master @@ -5881,97 +5915,97 @@ Initial commit nothing to commit -OK (1.19s) +OK (0.18s) add: fatal: this operation must be run in a work tree -OK (1.75s) +OK (0.24s) -All 2 tests passed (2.94s) +All 2 tests passed (0.42s) On branch master nothing to commit, working tree clean -OK (2.21s) +OK (0.39s) add extras: On branch master nothing to commit, working tree clean -OK (2.12s) +OK (0.33s) shared clone: On branch master nothing to commit, working tree clean -OK (1.33s) +OK (0.24s) log: On branch master nothing to commit, working tree clean -+ Fri, 27 May 2022 09:40:59 -12 foo | e7606608-e547-4601-8dd0-99c2f579a0b9 -- test repo [origin] -OK (1.49s) ++ Sun, 25 Apr 2021 05:55:12 +14 foo | 6852b14c-afef-4bf9-a907-be87b87c33ce -- test repo [origin] +OK (0.27s) import: On branch master nothing to commit, working tree clean Could not verify that the content is still present in the annex; not removing from the import location. -OK (4.58s) +OK (0.68s) reinject: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (1.57s) +OK (0.29s) unannex (no copy): On branch master nothing to commit, working tree clean -OK (2.03s) +OK (0.31s) unannex (with copy): On branch master nothing to commit, working tree clean -OK (2.42s) +OK (0.41s) drop (no remote): On branch master nothing to commit, working tree clean -OK (3.10s) +OK (0.51s) drop (with remote): On branch master nothing to commit, working tree clean numcopies 2 ok (recording state in git...) numcopies 1 ok (recording state in git...) -OK (3.65s) +OK (0.66s) drop (untrusted remote): On branch master nothing to commit, working tree clean -OK (2.98s) +OK (0.51s) get: On branch master nothing to commit, working tree clean -OK (3.18s) +OK (0.56s) get (ssh remote): On branch master nothing to commit, working tree clean -OK (3.34s) +OK (0.58s) move: On branch master nothing to commit, working tree clean -OK (5.04s) +OK (0.85s) move (ssh remote): On branch master nothing to commit, working tree clean -OK (6.12s) +OK (0.99s) copy: On branch master nothing to commit, working tree clean -OK (4.92s) +OK (0.83s) lock: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (1.38s) +OK (0.27s) lock (v7 --force): On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (1.41s) +OK (0.28s) edit (no pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (1.54s) +OK (0.29s) edit (pre-commit): On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (7.20s) +OK (0.28s) partial commit: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (0.26s) +OK (0.27s) fix: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (2.12s) +OK (0.29s) direct: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (2.61s) +OK (0.28s) trust: On branch master nothing to commit, working tree clean -OK (5.38s) +OK (0.76s) fsck (basics): On branch master nothing to commit, working tree clean numcopies 2 ok @@ -5982,18 +6016,18 @@ Back it up with git-annex copy. numcopies 1 ok (recording state in git...) -OK (6.46s) - fsck (bare): OK (1.14s) +OK (0.87s) + fsck (bare): OK (0.15s) fsck (local untrusted): On branch master nothing to commit, working tree clean Only these untrusted locations may have copies of foo - 3f6eea30-688f-4c70-95d7-927b4ab695d1 -- .t/tmprepo222 [here] - e7606608-e547-4601-8dd0-99c2f579a0b9 -- test repo [origin] + 6852b14c-afef-4bf9-a907-be87b87c33ce -- test repo [origin] + 9132730a-9b48-4d96-8d32-b0b399a3c7f6 -- .t/tmprepo222 [here] Back it up to trusted locations with git-annex copy. Only these untrusted locations may have copies of sha1foo - e7606608-e547-4601-8dd0-99c2f579a0b9 -- test repo [origin] + 6852b14c-afef-4bf9-a907-be87b87c33ce -- test repo [origin] Back it up to trusted locations with git-annex copy. -OK (14.31s) +OK (0.58s) fsck (remote untrusted): On branch master nothing to commit, working tree clean numcopies 2 ok @@ -6001,30 +6035,30 @@ Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: - e7606608-e547-4601-8dd0-99c2f579a0b9 -- test repo [origin] + 6852b14c-afef-4bf9-a907-be87b87c33ce -- test repo [origin] Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: - e7606608-e547-4601-8dd0-99c2f579a0b9 -- test repo [origin] -OK (6.11s) + 6852b14c-afef-4bf9-a907-be87b87c33ce -- test repo [origin] +OK (0.57s) fsck --from remote: On branch master nothing to commit, working tree clean -OK (2.08s) +OK (0.31s) migrate: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (2.10s) +OK (0.27s) migrate (via gitattributes): On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (6.67s) +OK (0.28s) unused: On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (4.57s) +OK (0.27s) describe: On branch master nothing to commit, working tree clean -OK (8.54s) +OK (0.32s) find: On branch master nothing to commit, working tree clean foo @@ -6032,14 +6066,14 @@ sha1foo sha1foo dir/subfile -OK (13.08s) +OK (1.10s) merge: On branch master nothing to commit, working tree clean -OK (0.72s) +OK (0.26s) info: On branch master nothing to commit, working tree clean -{"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":true,"uuid":"d015f1f8-f8e4-4f3d-9b84-539645a625fc","description":".t/tmprepo231"},{"here":false,"uuid":"e7606608-e547-4601-8dd0-99c2f579a0b9","description":"test repo [origin]"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"direct","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"151.93 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} -OK (2.28s) +{"local annex size":"0 bytes","size of annexed files in working tree":"45 bytes","command":"info","untrusted repositories":[],"success":true,"semitrusted repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":false,"uuid":"6852b14c-afef-4bf9-a907-be87b87c33ce","description":"test repo [origin]"},{"here":true,"uuid":"f4bad848-f596-4ea3-b221-439e9a7f12e6","description":".t/tmprepo231"}],"bloom filter size":"32 mebibytes (0% full)","repository mode":"direct","backend usage":{"SHA1":1,"SHA256E":1},"transfers in progress":[],"local annex keys":0,"available local disk space":"188.25 gigabytes (+1 megabyte reserved)","annexed files in working tree":2,"file":null,"trusted repositories":[]} +OK (0.32s) version: On branch master nothing to commit, working tree clean git-annex version: 7.20190129 @@ -6051,7 +6085,7 @@ supported repository versions: 5 7 upgrade supported from repository versions: 0 1 2 3 4 5 6 local repository version: 5 -OK (11.32s) +OK (0.24s) sync: On branch master nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo @@ -6060,11 +6094,11 @@ wanted . ok (recording state in git...) To /build/git-annex-7.20190129/.t/repo - 98c1dfd..9530fbc git-annex -> synced/git-annex + 4d0aad5..baa4b07 git-annex -> synced/git-annex foo To /build/git-annex-7.20190129/.t/repo - 9530fbc..1a6bd65 git-annex -> synced/git-annex -OK (18.04s) + baa4b07..7e21353 git-annex -> synced/git-annex +OK (1.60s) union merge regression: On branch master nothing to commit, working tree clean On branch master @@ -6108,22 +6142,22 @@ * [new branch] synced/git-annex -> r2/synced/git-annex * [new branch] synced/master -> r2/synced/master From ../../.t/tmprepo236 - 87c0a32..1a5c296 git-annex -> r3/git-annex + 7348621..69a2c83 git-annex -> r3/git-annex From ../../.t/tmprepo235 - 87c0a32..b62c217 git-annex -> r2/git-annex + 7348621..8286d74 git-annex -> r2/git-annex To ../../.t/tmprepo236 * [new branch] git-annex -> synced/git-annex To ../../.t/tmprepo235 - 87c0a32..6993765 git-annex -> synced/git-annex -OK (43.19s) + 7348621..175bfa2 git-annex -> synced/git-annex +OK (2.97s) adjusted branch merge regression: On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean -OK (3.18s) +OK (0.50s) adjusted branch subtree regression: On branch master nothing to commit, working tree clean -OK (1.98s) +OK (0.23s) conflict resolution: On branch master nothing to commit, working tree clean On branch master @@ -6138,7 +6172,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo241 - 8469014..fe2f343 annex/direct/master -> synced/master + a9fc013..fae1807 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo240 @@ -6147,17 +6181,17 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master From ../../.t/tmprepo241 - 8469014..fe2f343 annex/direct/master -> r2/annex/direct/master + a9fc013..fae1807 annex/direct/master -> r2/annex/direct/master conflictor.variant-a507 conflictor.variant-75dc conflictor.variant-a507 conflictor.variant-75dc -OK (29.46s) +OK (1.95s) conflict resolution (adjusted branch): On branch master nothing to commit, working tree clean On branch master nothing to commit, working tree clean -OK (2.20s) +OK (0.49s) conflict resolution movein regression: On branch master nothing to commit, working tree clean On branch master @@ -6179,15 +6213,15 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master To ../../.t/tmprepo244 - f966dff..2b90887 annex/direct/master -> synced/master + 843daae..4ab0381 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo245 - 61ec0ab..2b90887 annex/direct/master -> r2/annex/direct/master - 337c0bb..47fe088 git-annex -> r2/git-annex - f966dff..2b90887 master -> r2/master - f966dff..2b90887 synced/master -> r2/synced/master -OK (10.91s) + 3327238..4ab0381 annex/direct/master -> r2/annex/direct/master + eeefb44..5b4e3a4 git-annex -> r2/git-annex + 843daae..4ab0381 master -> r2/master + 843daae..4ab0381 synced/master -> r2/synced/master +OK (1.96s) conflict resolution (mixed directory and file): On branch master nothing to commit, working tree clean On branch master @@ -6202,7 +6236,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo247 - 03b0d2c..b32ef21 annex/direct/master -> synced/master + a41c223..329f436 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo246 @@ -6228,7 +6262,7 @@ Automatic merge failed; fix conflicts and then commit the result. conflictor: needs merge To ../../.t/tmprepo248 - 0da8a72..288e92f annex/direct/master -> synced/master + 8c23ef1..d013043 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Adding conflictor/subfile Automatic merge went well; stopped before committing as requested @@ -6241,7 +6275,7 @@ conflictor.variant-cc12 conflictor/subfile conflictor.variant-cc12 -OK (46.04s) +OK (3.84s) conflict resolution symlink bit: On branch master nothing to commit, working tree clean On branch master @@ -6249,36 +6283,36 @@ On branch master nothing to commit, working tree clean To /build/git-annex-7.20190129/.t/repo - 1a6bd65..8a510ae git-annex -> synced/git-annex - 61ec0ab..2d11718 annex/direct/master -> synced/master + 7e21353..78e63dc git-annex -> synced/git-annex + 3327238..a563e63 annex/direct/master -> synced/master conflictor From /build/git-annex-7.20190129/.t/repo - 1a6bd65..8a510ae git-annex -> origin/git-annex - 61ec0ab..2d11718 master -> origin/master - 1a6bd65..8a510ae synced/git-annex -> origin/synced/git-annex - 61ec0ab..2d11718 synced/master -> origin/synced/master + 7e21353..78e63dc git-annex -> origin/git-annex + 3327238..a563e63 master -> origin/master + 7e21353..78e63dc synced/git-annex -> origin/synced/git-annex + 3327238..a563e63 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 To /build/git-annex-7.20190129/.t/repo - 8a510ae..8e9ab78 git-annex -> synced/git-annex - 2d11718..b6f5387 annex/direct/master -> synced/master + 78e63dc..a4958b5 git-annex -> synced/git-annex + a563e63..f45a848 annex/direct/master -> synced/master conflictor/subfile From /build/git-annex-7.20190129/.t/repo - 1a6bd65..8e9ab78 git-annex -> origin/git-annex - 61ec0ab..b6f5387 master -> origin/master - 1a6bd65..8e9ab78 synced/git-annex -> origin/synced/git-annex - 61ec0ab..b6f5387 synced/master -> origin/synced/master + 7e21353..a4958b5 git-annex -> origin/git-annex + 3327238..f45a848 master -> origin/master + 7e21353..a4958b5 synced/git-annex -> origin/synced/git-annex + 3327238..f45a848 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 To /build/git-annex-7.20190129/.t/repo - 8e9ab78..3cbeaa6 git-annex -> synced/git-annex - b6f5387..90c9713 annex/direct/master -> synced/master + a4958b5..388c614 git-annex -> synced/git-annex + f45a848..2d6e96b annex/direct/master -> synced/master conflictor/subfile -OK (58.19s) +OK (2.62s) conflict resolution (uncommitted local file): On branch master nothing to commit, working tree clean On branch master @@ -6289,9 +6323,9 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Automatic merge went well; stopped before committing as requested -error: duplicate parent d51a448af48e267b3152f2e73c2dbd4581b47d17 ignored +error: duplicate parent fd0c6b2dc2a3a07c2b567690a191371b6000c067 ignored To ../../.t/tmprepo253 - d51a448..aa3016a annex/direct/master -> synced/master + fd0c6b2..7745265 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex On branch master nothing to commit, working tree clean @@ -6303,11 +6337,11 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Automatic merge went well; stopped before committing as requested -error: duplicate parent 57645a199dcafcd4a1d8f86e7f62399cfe82d2be ignored +error: duplicate parent 54c7dbe17d1a8588d9f3b0f0c61b188547346348 ignored To ../../.t/tmprepo255 - 57645a1..b953cff annex/direct/master -> synced/master + 54c7dbe..48236a8 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex -OK (13.87s) +OK (2.49s) conflict resolution (removed file): On branch master nothing to commit, working tree clean On branch master @@ -6318,9 +6352,9 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Automatic merge went well; stopped before committing as requested -error: duplicate parent 3dfa47fcf4a4fc17c47f21f77fc8f835ee9b1fe8 ignored +error: duplicate parent 1c1cb86d34991b1c0f39fd6bb0f48b2080acb310 ignored To ../../.t/tmprepo257 - 3dfa47f..14a8937 annex/direct/master -> synced/master + 1c1cb86..c00b7b3 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Already up to date! Automatic merge went well; stopped before committing as requested @@ -6330,25 +6364,25 @@ * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo258 - 14a8937..a6b8711 annex/direct/master -> synced/master + c00b7b3..536fc7c annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex 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 From ../../.t/tmprepo257 - 3dfa47f..a6b8711 annex/direct/master -> r1/annex/direct/master - 17286c2..95ac1c7 git-annex -> r1/git-annex - 14a8937..a6b8711 master -> r1/master - 14a8937..a6b8711 synced/master -> r1/synced/master + 1c1cb86..536fc7c annex/direct/master -> r1/annex/direct/master + c4dc415..5333f93 git-annex -> r1/git-annex + c00b7b3..536fc7c master -> r1/master + c00b7b3..536fc7c synced/master -> r1/synced/master To ../../.t/tmprepo257 - 17286c2..95ac1c7 git-annex -> synced/git-annex - a6b8711..aa937a3 annex/direct/master -> synced/master + c4dc415..5333f93 git-annex -> synced/git-annex + 536fc7c..6375352 annex/direct/master -> synced/master Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo258 - 14a8937..aa937a3 annex/direct/master -> r2/annex/direct/master - 95ac1c7..9d2f25b git-annex -> r2/git-annex - a6b8711..aa937a3 master -> r2/master - a6b8711..aa937a3 synced/master -> r2/synced/master + c00b7b3..6375352 annex/direct/master -> r2/annex/direct/master + 5333f93..b56d406 git-annex -> r2/git-annex + 536fc7c..6375352 master -> r2/master + 536fc7c..6375352 synced/master -> r2/synced/master On branch master nothing to commit, working tree clean On branch master @@ -6359,13 +6393,13 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master Automatic merge went well; stopped before committing as requested -error: duplicate parent 0f01a16002991da833a20bfc5dea7743a9058c80 ignored +error: duplicate parent d10fc36cce4a4d719125077417fbbae38193bd44 ignored To ../../.t/tmprepo259 - 0f01a16..bf94123 annex/direct/master -> synced/master + d10fc36..02fe882 annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex To ../../.t/tmprepo259 - 289e765..54e249b git-annex -> synced/git-annex - bf94123..a095740 annex/direct/master -> synced/master + f03099b..46e6ab9 git-annex -> synced/git-annex + 02fe882..c7fff35 annex/direct/master -> 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 @@ -6375,15 +6409,15 @@ * [new branch] master -> r2/master * [new branch] synced/master -> r2/synced/master To ../../.t/tmprepo260 - a095740..923c747 annex/direct/master -> synced/master + c7fff35..bf152dd annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo259 - 0f01a16..923c747 annex/direct/master -> r1/annex/direct/master - 54e249b..da79324 git-annex -> r1/git-annex - a095740..923c747 master -> r1/master - a095740..923c747 synced/master -> r1/synced/master -OK (25.80s) + d10fc36..bf152dd annex/direct/master -> r1/annex/direct/master + 46e6ab9..236357d git-annex -> r1/git-annex + c7fff35..bf152dd master -> r1/master + c7fff35..bf152dd synced/master -> r1/synced/master +OK (4.67s) conflict resolution (nonannexed file): On branch master nothing to commit, working tree clean On branch master @@ -6400,7 +6434,7 @@ nothing to commit, working tree clean On branch master nothing to commit, working tree clean -OK (8.84s) +OK (1.97s) conflict resolution (nonannexed symlink): On branch master nothing to commit, working tree clean On branch master @@ -6417,7 +6451,7 @@ nothing to commit, working tree clean On branch master nothing to commit, working tree clean -OK (8.73s) +OK (1.95s) conflict resolution (mixed locked and unlocked file): On branch master nothing to commit, working tree clean On branch master @@ -6427,13 +6461,13 @@ * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master Automatic merge went well; stopped before committing as requested -error: duplicate parent 90c971388e879c5e8ca4305bda7e8d14e09a7ef3 ignored +error: duplicate parent 2d6e96b4655d5b2a066407618ac3dd403ee3bc2e ignored To ../../.t/tmprepo278 * [new branch] git-annex -> synced/git-annex * [new branch] annex/direct/master -> synced/master To /build/git-annex-7.20190129/.t/repo - 3cbeaa6..6b5062e git-annex -> synced/git-annex - 90c9713..484630d annex/direct/master -> synced/master + 388c614..980997a git-annex -> synced/git-annex + 2d6e96b..946f652 annex/direct/master -> synced/master Automatic merge went well; stopped before committing as requested From ../../.t/tmprepo277 * [new branch] annex/direct/master -> r1/annex/direct/master @@ -6441,43 +6475,43 @@ * [new branch] master -> r1/master * [new branch] synced/master -> r1/synced/master From /build/git-annex-7.20190129/.t/repo - 3cbeaa6..6b5062e git-annex -> origin/git-annex - 90c9713..484630d master -> origin/master - 3cbeaa6..6b5062e synced/git-annex -> origin/synced/git-annex - 90c9713..484630d synced/master -> origin/synced/master + 388c614..980997a git-annex -> origin/git-annex + 2d6e96b..946f652 master -> origin/master + 388c614..980997a synced/git-annex -> origin/synced/git-annex + 2d6e96b..946f652 synced/master -> origin/synced/master From ../../.t/tmprepo278 - 61ec0ab..484630d annex/direct/master -> r2/annex/direct/master -OK (8.88s) + 3327238..946f652 annex/direct/master -> r2/annex/direct/master +OK (1.75s) map: On branch master nothing to commit, working tree clean -OK (1.72s) +OK (0.35s) uninit: On branch master nothing to commit, working tree clean -Deleted branch git-annex (was 70c7242). +Deleted branch git-annex (was bf5b14e). ExitSuccess -OK (1.90s) +OK (0.40s) uninit (in git-annex branch): On branch master nothing to commit, working tree clean not supported in direct mode; skipping -OK (1.49s) +OK (0.27s) upgrade: On branch master nothing to commit, working tree clean -OK (1.82s) +OK (0.35s) whereis: On branch master nothing to commit, working tree clean -OK (2.72s) +OK (0.54s) hook remote: On branch master nothing to commit, working tree clean -OK (4.39s) +OK (0.83s) directory remote: On branch master nothing to commit, working tree clean -OK (4.51s) +OK (0.80s) rsync remote: On branch master nothing to commit, working tree clean -OK (5.10s) +OK (1.03s) bup remote: On branch master nothing to commit, working tree clean -OK (1.36s) +OK (0.23s) crypto: On branch master nothing to commit, working tree clean git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) @@ -6490,7 +6524,7 @@ nothing to commit, working tree clean git-annex: There is already a special remote named "foo". (Use enableremote to enable an existing special remote.) initremote: 1 failed -OK (30.07s) +OK (6.35s) preferred content: On branch master nothing to commit, working tree clean wanted . ok @@ -6503,21 +6537,21 @@ (recording state in git...) wanted . ok (recording state in git...) -OK (9.72s) +OK (1.62s) add subdirs: On branch master nothing to commit, working tree clean Automatic merge went well; stopped before committing as requested To /build/git-annex-7.20190129/.t/repo - 6b5062e..d4ed584 git-annex -> synced/git-annex - 484630d..c67bfb6 annex/direct/master -> synced/master -OK (4.86s) + 980997a..963885c git-annex -> synced/git-annex + 946f652..13a9e65 annex/direct/master -> synced/master +OK (0.84s) addurl: On branch master nothing to commit, working tree clean Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo293/myurl download failed: Configuration does not allow accessing file:///build/git-annex-7.20190129/.t/tmprepo293/myurl -OK (2.28s) +OK (0.42s) -All 227 tests passed (1558.80s) +All 227 tests passed (374.10s) make[1]: Leaving directory '/build/git-annex-7.20190129' fakeroot debian/rules binary dh binary @@ -6584,12 +6618,14 @@ dpkg-source: info: using options from git-annex-7.20190129/debian/source/options: --single-debian-patch --auto-commit dpkg-buildpackage: info: binary-only upload (no source included) I: copying local configuration +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/13283/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/51633 and its subdirectories -I: Current time: Fri May 27 09:59:08 -12 2022 -I: pbuilder-time-stamp: 1653688748 +I: removing directory /srv/workspace/pbuilder/13283 and its subdirectories +I: Current time: Sun Apr 25 05:57:21 +14 2021 +I: pbuilder-time-stamp: 1619279841