Source: git-annex
Version: 7.20190129-2
Severity: serious
Tags: buster sid
User: debian...@lists.debian.org
Usertags: qa-ftbfs-20190315 qa-ftbfs
Justification: FTBFS in buster on amd64
Hi,
During a rebuild of all packages in buster (in a buster chroot, not a
sid chroot), your package failed to build on amd64.
Relevant part (hopefully):
> make[1]: Entering directory '/<<PKGBUILDDIR>>'
> ./Setup build -j1
> Preprocessing executable 'git-annex' for git-annex-7.20190129..
> Building executable 'git-annex' for git-annex-7.20190129..
> if [ "./Setup" = stack ]; then \
> ln -sf $(stack path --dist-dir)/build/git-annex/git-annex git-annex; \
> else \
> ln -sf dist/build/git-annex/git-annex git-annex; \
> fi
> ln -sf git-annex git-annex-shell
> ./git-annex test
> Tests
> QuickCheck
> prop_encode_decode_roundtrip: OK (0.04s)
> +++ OK, passed 1000 tests.
> prop_encode_c_decode_c_roundtrip: OK (0.03s)
> +++ OK, passed 1000 tests.
> prop_isomorphic_key_encode: OK (0.03s)
> +++ OK, passed 1000 tests.
> prop_isomorphic_shellEscape: OK (0.02s)
> +++ OK, passed 1000 tests.
> prop_isomorphic_shellEscape_multiword: OK (0.92s)
> +++ OK, passed 1000 tests.
> prop_isomorphic_configEscape: OK (0.02s)
> +++ OK, passed 1000 tests.
> prop_parse_show_Config: OK (0.05s)
> +++ OK, passed 1000 tests.
> prop_upFrom_basics: OK (0.02s)
> +++ OK, passed 1000 tests.
> prop_relPathDirToFile_basics: OK (0.03s)
> +++ OK, passed 1000 tests.
> prop_relPathDirToFile_regressionTest: OK
> +++ OK, passed 1 tests.
> prop_cost_sane: OK
> +++ OK, passed 1 tests.
> prop_matcher_sane: OK
> +++ OK, passed 1 tests.
> prop_HmacSha1WithCipher_sane: OK
> +++ OK, passed 1 tests.
> prop_VectorClock_sane: OK
> +++ OK, passed 1 tests.
> prop_addMapLog_sane: OK
> +++ OK, passed 1 tests.
> prop_verifiable_sane: OK (0.10s)
> +++ OK, passed 1000 tests.
> prop_segment_regressionTest: OK
> +++ OK, passed 1 tests.
> prop_read_write_transferinfo: OK (0.04s)
> +++ OK, passed 1000 tests.
> prop_read_show_inodecache: OK (0.02s)
> +++ OK, passed 1000 tests.
> prop_parse_build_log: OK (1.56s)
> +++ OK, passed 1000 tests.
> prop_read_show_TrustLevel: OK
> +++ OK, passed 1 tests.
> prop_parse_build_TrustLevelLog: OK
> +++ OK, passed 1 tests.
> prop_hashes_stable: OK
> +++ OK, passed 1 tests.
> prop_mac_stable: OK
> +++ OK, passed 1 tests.
> prop_schedule_roundtrips: OK
> +++ OK, passed 1000 tests.
> prop_past_sane: OK
> +++ OK, passed 1 tests.
> prop_duration_roundtrips: OK
> +++ OK, passed 1000 tests.
> prop_metadata_sane: OK (4.69s)
> +++ OK, passed 1000 tests.
> prop_metadata_serialize: OK (4.35s)
> +++ OK, passed 1000 tests.
> prop_branchView_legal: OK (1.31s)
> +++ OK, passed 1000 tests.
> prop_viewPath_roundtrips: OK (0.03s)
> +++ OK, passed 1000 tests.
> prop_view_roundtrips: OK (1.04s)
> +++ OK, passed 1000 tests.
> prop_viewedFile_rountrips: OK (0.02s)
> +++ OK, passed 1000 tests.
> prop_b64_roundtrips: OK
> +++ OK, passed 1000 tests.
> prop_standardGroups_parse: OK
> +++ OK, passed 1 tests.
> Unit Tests v5
> add dup: Init Tests
> init: OK (0.03s)
> add: OK (0.09s)
>
> All 2 tests passed (0.12s)
> OK (0.09s)
> add extras: OK (0.08s)
> shared clone: OK (0.05s)
> log: + Sat, 16 Mar 2019
> 04:52:41 UTC foo | e05e3e7a-d220-4fd8-a60d-5eb6cd177caa -- test repo [origin]
> OK (0.06s)
> import: Could not verify
> that the content is still present in the annex; not removing from the import
> location.
> OK (0.22s)
> reinject: OK (0.13s)
> unannex (no copy): OK (0.07s)
> unannex (with copy): OK (0.12s)
> drop (no remote): OK (0.14s)
> drop (with remote): numcopies 2 ok
> (recording state in git...)
> numcopies 1 ok
> (recording state in git...)
> OK (0.18s)
> drop (untrusted remote): OK (0.12s)
> get: OK (0.14s)
> get (ssh remote): OK (0.15s)
> move: OK (0.27s)
> move (ssh remote): OK (0.33s)
> copy: OK (0.24s)
> 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 (0.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 (0.19s)
> edit (no pre-commit): add foo ok
> ok
> (recording state in git...)
> OK (0.15s)
> edit (pre-commit): OK (0.13s)
> 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 (0.11s)
> fix: OK (0.14s)
> direct: On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> ok
> On branch annex/direct/master
> Changes not staged for commit:
> typechange: foo
>
> no changes added to commit
> OK (0.17s)
> trust: OK (0.21s)
> fsck (basics): numcopies 2 ok
> (recording state in git...)
> Only 1 of 2 trustworthy copies exist of foo
> Back it up with git-annex copy.
> Only 1 of 2 trustworthy copies exist of sha1foo
> Back it up with git-annex copy.
> numcopies 1 ok
> (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 (0.23s)
> fsck (bare): OK (0.05s)
> fsck (local untrusted): Only these
> untrusted locations may have copies of foo
> e05e3e7a-d220-4fd8-a60d-5eb6cd177caa -- test repo [origin]
> ecef452a-a265-46d6-b7a4-e530b474f7e7 -- .t/tmprepo26 [here]
> Back it up to trusted locations with git-annex copy.
> Only these untrusted locations may have copies of sha1foo
> e05e3e7a-d220-4fd8-a60d-5eb6cd177caa -- test repo [origin]
> Back it up to trusted locations with git-annex copy.
> OK (0.15s)
> 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:
> e05e3e7a-d220-4fd8-a60d-5eb6cd177caa -- 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:
> e05e3e7a-d220-4fd8-a60d-5eb6cd177caa -- test repo [origin]
> OK (0.15s)
> fsck --from remote: OK (0.07s)
> migrate: OK (0.28s)
> migrate (via gitattributes): OK (0.27s)
> unused: git-annex: 10 not
> valid (run git annex unused for list)
> git-annex: 501 not valid (run git annex unused for list)
> OK (0.38s)
> describe: OK (0.07s)
> find: foo
> foo
> sha1foo
> sha1foo
> dir/subfile
> OK (0.32s)
> merge: OK (0.06s)
> 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":"e05e3e7a-d220-4fd8-a60d-5eb6cd177caa","description":"test
> repo
> [origin]"},{"here":true,"uuid":"e23332d5-59b9-4d0f-8d27-4bdc43c18456","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":"92.02 gigabytes (+1 megabyte
> reserved)","annexed files in working tree":2,"file":null,"trusted
> repositories":[]}
> OK (0.08s)
> 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
> key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E
> SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E
> SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256
> BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224
> BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160
> BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224
> SHA1E SHA1 MD5E MD5 WORM URL
> remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb
> tahoe glacier ddar hook external
> operating system: linux x86_64
> supported repository versions: 5 7
> upgrade supported from repository versions: 0 1 2 3 4 5 6
> local repository version: 5
> OK (0.05s)
> sync: On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> foo
> wanted . ok
> (recording state in git...)
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> 66f7766..8bdf0fa 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 /<<PKGBUILDDIR>>/.t/repo
> 8bdf0fa..10e7c36 git-annex -> synced/git-annex
> OK (0.56s)
> union merge regression: On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo39
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> From ../../.t/tmprepo38
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> To ../../.t/tmprepo39
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> To ../../.t/tmprepo38
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo40
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo38
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/git-annex -> r1/synced/git-annex
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo40
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo39
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/git-annex -> r2/synced/git-annex
> * [new branch] synced/master -> r2/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo40
> 765c5e4..2bb6c35 git-annex -> r3/git-annex
> From ../../.t/tmprepo39
> 765c5e4..c754e8c git-annex -> r2/git-annex
> To ../../.t/tmprepo40
> * [new branch] git-annex -> synced/git-annex
> To ../../.t/tmprepo39
> 765c5e4..f4ba510 git-annex -> synced/git-annex
> OK (0.94s)
> adjusted branch merge regression: OK (0.10s)
> adjusted branch subtree regression: OK (0.05s)
> conflict resolution: [master c02026d]
> git-annex in .t/tmprepo44
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master dd2cb1d] git-annex in .t/tmprepo45
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo45
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master efdf1c7] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo45
> dd2cb1d..efdf1c7 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating dd2cb1d..efdf1c7
> 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
> From ../../.t/tmprepo44
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo45
> dd2cb1d..efdf1c7 master -> r2/master
> conflictor.variant-a507
> conflictor.variant-75dc
> conflictor.variant-a507
> conflictor.variant-75dc
> OK (0.53s)
> conflict resolution (adjusted branch): OK (0.10s)
> conflict resolution movein regression: add foo ok
> ok
> (recording state in git...)
> [master d7ca7ed] git-annex in .t/tmprepo48
> 1 file changed, 1 insertion(+), 1 deletion(-)
> From ../../.t/tmprepo49
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> To ../../.t/tmprepo49
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> add foo ok
> ok
> (recording state in git...)
> [master b0749f1] 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 7296c3d] 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
> d7ca7ed..7296c3d master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating d7ca7ed..7296c3d
> Fast-forward
> foo => foo.variant-0b0e | 0
> foo.variant-bc25 | 1 +
> 2 files changed, 1 insertion(+)
> rename foo => foo.variant-0b0e (100%)
> create mode 120000 foo.variant-bc25
> From ../../.t/tmprepo49
> c3711b7..2d312b9 git-annex -> r2/git-annex
> d3c7b88..7296c3d master -> r2/master
> d7ca7ed..7296c3d synced/master -> r2/synced/master
> OK (0.57s)
> conflict resolution (mixed directory and file): [master 26a9250]
> git-annex in .t/tmprepo50
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master a6c0e57] git-annex in .t/tmprepo51
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo51
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Adding conflictor/subfile
> CONFLICT (file/directory): There is a directory with name conflictor in
> refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master d799204] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo51
> a6c0e57..d799204 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating a6c0e57..d799204
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo50
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> [master 769a48a] git-annex in .t/tmprepo52
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 4a23259] git-annex in .t/tmprepo53
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo52
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Adding conflictor/subfile
> CONFLICT (directory/file): There is a directory with name conflictor in HEAD.
> Adding conflictor as conflictor~refs_remotes_r1_master
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 4e73654] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo52
> 769a48a..4e73654 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 769a48a..4e73654
> Fast-forward
> conflictor => conflictor.variant-cc12 | 0
> conflictor/subfile | 1 +
> 2 files changed, 1 insertion(+)
> rename conflictor => conflictor.variant-cc12 (100%)
> create mode 120000 conflictor/subfile
> From ../../.t/tmprepo53
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> OK (1.03s)
> conflict resolution symlink bit: [master 94f8bbe]
> git-annex in .t/tmprepo54
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> To /<<PKGBUILDDIR>>/.t/repo
> 10e7c36..a40492f git-annex -> synced/git-annex
> d3c7b88..94f8bbe master -> synced/master
> conflictor
> [master 8a553c2] git-annex in .t/tmprepo55
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> From /<<PKGBUILDDIR>>/.t/repo
> 10e7c36..a40492f git-annex -> origin/git-annex
> 10e7c36..a40492f synced/git-annex -> origin/synced/git-annex
> d3c7b88..94f8bbe 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 31ccfd7] git-annex automatic merge conflict fix
> To /<<PKGBUILDDIR>>/.t/repo
> a40492f..55b73e0 git-annex -> synced/git-annex
> 94f8bbe..31ccfd7 master -> synced/master
> conflictor/subfile
> [master 559ccdd] git-annex in .t/tmprepo56
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> From /<<PKGBUILDDIR>>/.t/repo
> 10e7c36..55b73e0 git-annex -> origin/git-annex
> 10e7c36..55b73e0 synced/git-annex -> origin/synced/git-annex
> d3c7b88..31ccfd7 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 f553ed3] git-annex automatic merge conflict fix
> To /<<PKGBUILDDIR>>/.t/repo
> 55b73e0..3700c77 git-annex -> synced/git-annex
> 31ccfd7..f553ed3 master -> synced/master
> conflictor/subfile
> OK (0.69s)
> conflict resolution (uncommitted local file): [master fa577f2]
> git-annex in .t/tmprepo57
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> Untracked files:
> conflictor
>
> nothing added to commit but untracked files present
> From ../../.t/tmprepo57
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating d3c7b88..fa577f2
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating d3c7b88..fa577f2
> To ../../.t/tmprepo57
> * [new branch] git-annex -> synced/git-annex
> ! [rejected] master -> synced/master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo57'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and integrate the remote changes
> hint: (e.g. 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> To ../../.t/tmprepo57
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo57'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to r1 failed.
> [master 17d96c0] git-annex in .t/tmprepo59
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/file
> On branch master
> Untracked files:
> conflictor
>
> nothing added to commit but untracked files present
> From ../../.t/tmprepo59
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating d3c7b88..17d96c0
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating d3c7b88..17d96c0
> To ../../.t/tmprepo59
> * [new branch] git-annex -> synced/git-annex
> ! [rejected] master -> synced/master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo59'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and integrate the remote changes
> hint: (e.g. 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> To ../../.t/tmprepo59
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo59'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to r1 failed.
> OK (0.58s)
> conflict resolution (removed file): [master 81b6014]
> git-annex in .t/tmprepo61
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo61
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating d3c7b88..81b6014
> Fast-forward
> conflictor | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> Already up to date.
> To ../../.t/tmprepo61
> * [new branch] git-annex -> synced/git-annex
> [master a0d765f] git-annex in .t/tmprepo61
> 1 file changed, 1 deletion(-)
> delete mode 120000 conflictor
> From ../../.t/tmprepo62
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> To ../../.t/tmprepo62
> 81b6014..a0d765f master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> add conflictor ok
> ok
> (recording state in git...)
> [master 1d8cf7d] 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 a92a675] git-annex automatic merge conflict fix
> From ../../.t/tmprepo61
> d91ec55..7e3ed50 git-annex -> r1/git-annex
> 81b6014..a0d765f master -> r1/master
> 81b6014..a0d765f synced/master -> r1/synced/master
> To ../../.t/tmprepo61
> d91ec55..5b38d5b git-annex -> synced/git-annex
> a0d765f..a92a675 master -> synced/master
> On branch master
> nothing to commit, working tree clean
> Updating a0d765f..a92a675
> Fast-forward
> conflictor.variant-0cbf | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-0cbf
> From ../../.t/tmprepo62
> 7e3ed50..5b38d5b git-annex -> r2/git-annex
> 81b6014..a92a675 master -> r2/master
> a0d765f..a92a675 synced/master -> r2/synced/master
> [master 57b79a9] git-annex in .t/tmprepo63
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo63
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating d3c7b88..57b79a9
> Fast-forward
> conflictor | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> Already up to date.
> To ../../.t/tmprepo63
> * [new branch] git-annex -> synced/git-annex
> add conflictor ok
> ok
> (recording state in git...)
> [master b02f2d1] git-annex in .t/tmprepo64
> 1 file changed, 1 insertion(+), 1 deletion(-)
> To ../../.t/tmprepo63
> e232903..0967bd0 git-annex -> synced/git-annex
> 57b79a9..b02f2d1 master -> synced/master
> [master 06173f0] 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 4374450] 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
> b02f2d1..4374450 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating b02f2d1..4374450
> Fast-forward
> conflictor => conflictor.variant-0cbf | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename conflictor => conflictor.variant-0cbf (100%)
> From ../../.t/tmprepo63
> 57b79a9..4374450 master -> r1/master
> b02f2d1..4374450 synced/master -> r1/synced/master
> OK (1.28s)
> conflict resolution (nonannexed file): [master 140d5ff]
> git-annex in .t/tmprepo65
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 8ff6d27] git-annex in .t/tmprepo66
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo66
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 14db19b] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo66
> 8ff6d27..14db19b master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 8ff6d27..14db19b
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo65
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master 40d4d68] git-annex in .t/tmprepo67
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 221ecea] git-annex in .t/tmprepo68
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo67
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 7839694] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo67
> 40d4d68..7839694 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 40d4d68..7839694
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> mode change 120000 => 100644 conflictor
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo68
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> [master 8502234] git-annex in .t/tmprepo69
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 8ecfff0] git-annex in .t/tmprepo70
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo70
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo70
> 8ecfff0..33f2b99 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo69
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> error: duplicate parent 33f2b99617cc8c51d238d95a7ad87a0dbf93c222 ignored
> To ../../.t/tmprepo69
> 33f2b99..efd75a2 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> [master 1ca9e20] git-annex in .t/tmprepo71
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master f43064c] git-annex in .t/tmprepo72
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo71
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo71
> 1ca9e20..8f4467f annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo72
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> error: duplicate parent 8f4467ffa06ef012a7a1052be724caac47d9f4a3 ignored
> To ../../.t/tmprepo72
> 8f4467f..0d6a5b4 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> OK (1.90s)
> conflict resolution (nonannexed symlink): [master 0ae0b3f]
> git-annex in .t/tmprepo73
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 69d3212] git-annex in .t/tmprepo74
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo74
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master eb359f7] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo74
> 69d3212..eb359f7 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 69d3212..eb359f7
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo73
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master b9fd815] git-annex in .t/tmprepo75
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master f848c02] git-annex in .t/tmprepo76
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo75
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 17c6442] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo75
> b9fd815..17c6442 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating b9fd815..17c6442
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo76
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> [master 06585ca] git-annex in .t/tmprepo77
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master c610f7e] git-annex in .t/tmprepo78
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo78
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo78
> c610f7e..e15eba6 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo77
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> error: duplicate parent e15eba6a3db6a2f62cb5cacd4219806e6e228050 ignored
> To ../../.t/tmprepo77
> e15eba6..7550199 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> [master f62c2cc] git-annex in .t/tmprepo79
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 0bedaf1] git-annex in .t/tmprepo80
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo79
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo79
> f62c2cc..2838202 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo80
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> error: duplicate parent 2838202d96f561928e165413d3939bbc27eae889 ignored
> To ../../.t/tmprepo80
> 2838202..6a2dd26 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> OK (1.89s)
> conflict resolution (mixed locked and unlocked file): On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> From ../../.t/tmprepo82
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> Updating d3c7b88..f553ed3
> Fast-forward
> conflictor.variant-cc12 | 1 +
> conflictor/subfile | 1 +
> 2 files changed, 2 insertions(+)
> create mode 120000 conflictor.variant-cc12
> create mode 120000 conflictor/subfile
> To ../../.t/tmprepo82
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> To /<<PKGBUILDDIR>>/.t/repo
> 3700c77..7cc5e8a git-annex -> synced/git-annex
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> Updating d3c7b88..f553ed3
> Fast-forward
> conflictor.variant-cc12 | 1 +
> conflictor/subfile | 1 +
> 2 files changed, 2 insertions(+)
> create mode 120000 conflictor.variant-cc12
> create mode 120000 conflictor/subfile
> From ../../.t/tmprepo81
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> From /<<PKGBUILDDIR>>/.t/repo
> 3700c77..7cc5e8a git-annex -> origin/git-annex
> 3700c77..7cc5e8a 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
> d3c7b88..f553ed3 master -> r2/master
> OK (0.47s)
> map: OK (0.08s)
> uninit: Deleted branch
> git-annex (was b863401).
> ExitSuccess
> OK (0.22s)
> uninit (in git-annex branch): Switched to branch
> 'git-annex'
> OK (0.07s)
> upgrade: OK (0.07s)
> whereis: OK (0.14s)
> hook remote: OK (0.23s)
> directory remote: OK (0.22s)
> rsync remote: OK (0.45s)
> bup remote: OK (0.05s)
> 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 (3.39s)
> preferred content: wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> OK (0.48s)
> add subdirs: [master 3ed4200]
> git-annex in .t/tmprepo96
> 1 file changed, 1 insertion(+)
> create mode 120000 dir/foo
> Merge made by the 'recursive' strategy.
> conflictor.variant-cc12 | 1 +
> conflictor/subfile | 1 +
> 2 files changed, 2 insertions(+)
> create mode 120000 conflictor.variant-cc12
> create mode 120000 conflictor/subfile
> To /<<PKGBUILDDIR>>/.t/repo
> 7cc5e8a..17bf7c4 git-annex -> synced/git-annex
> f553ed3..fcff385 master -> synced/master
> OK (0.23s)
> addurl: Configuration does
> not allow accessing file:///<<PKGBUILDDIR>>/.t/tmprepo97/myurl
> download failed: Configuration does not allow accessing
> file:///<<PKGBUILDDIR>>/.t/tmprepo97/myurl
> OK (0.09s)
> Unit Tests v7 locked
> add dup: Init Tests
> init: OK (0.03s)
> add: OK (0.12s)
>
> All 2 tests passed (0.16s)
> OK (0.21s)
> add extras: OK (0.16s)
> shared clone: OK (0.10s)
> log: + Sat, 16 Mar 2019
> 04:53:04 UTC foo | 7b8c3295-7084-4f66-b346-ad8e5132a09d -- test repo [origin]
> OK (0.11s)
> import: Could not verify
> that the content is still present in the annex; not removing from the import
> location.
> OK (0.28s)
> reinject: OK (0.25s)
> unannex (no copy): OK (0.13s)
> unannex (with copy): OK (0.16s)
> drop (no remote): OK (0.19s)
> drop (with remote): numcopies 2 ok
> (recording state in git...)
> numcopies 1 ok
> (recording state in git...)
> OK (0.24s)
> drop (untrusted remote): OK (0.18s)
> get: OK (0.20s)
> get (ssh remote): OK (0.22s)
> move: OK (0.32s)
> move (ssh remote): OK (0.46s)
> copy: OK (0.29s)
> 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 (0.51s)
> 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 (0.28s)
> edit (no pre-commit): (recording state in
> git...)
> OK (0.33s)
> edit (pre-commit): OK (0.25s)
> partial commit: (recording state in
> git...)
> OK (0.32s)
> fix: OK (0.28s)
> direct: git-annex: Direct
> mode is not supported by this repository version. Use git-annex unlock
> instead.
> OK (0.21s)
> trust: OK (0.26s)
> fsck (basics): numcopies 2 ok
> (recording state in git...)
> Only 1 of 2 trustworthy copies exist of foo
> Back it up with git-annex copy.
> Only 1 of 2 trustworthy copies exist of sha1foo
> Back it up with git-annex copy.
> numcopies 1 ok
> (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 (0.30s)
> fsck (bare): OK (0.07s)
> fsck (local untrusted): Only these
> untrusted locations may have copies of foo
> 7b8c3295-7084-4f66-b346-ad8e5132a09d -- test repo [origin]
> 92f7a0f7-36e0-4f79-8309-e0b4c80d588f -- .t/tmprepo124 [here]
> Back it up to trusted locations with git-annex copy.
> Only these untrusted locations may have copies of sha1foo
> 7b8c3295-7084-4f66-b346-ad8e5132a09d -- test repo [origin]
> Back it up to trusted locations with git-annex copy.
> OK (0.21s)
> 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:
> 7b8c3295-7084-4f66-b346-ad8e5132a09d -- 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:
> 7b8c3295-7084-4f66-b346-ad8e5132a09d -- test repo [origin]
> OK (0.20s)
> fsck --from remote: OK (0.11s)
> migrate: OK (0.42s)
> migrate (via gitattributes): OK (0.49s)
> unused: git-annex: 10 not
> valid (run git annex unused for list)
> git-annex: 501 not valid (run git annex unused for list)
> OK (0.79s)
> describe: OK (0.12s)
> find: foo
> foo
> sha1foo
> sha1foo
> dir/subfile
> OK (0.40s)
> merge: OK (0.11s)
> 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":"40ce9177-f8f1-441c-afd9-d0eedc4d377c","description":".t/tmprepo133"},{"here":false,"uuid":"7b8c3295-7084-4f66-b346-ad8e5132a09d","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":"91.95
> gigabytes (+1 megabyte reserved)","annexed files in working
> tree":2,"file":null,"trusted repositories":[]}
> OK (0.13s)
> 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
> key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E
> SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E
> SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256
> BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224
> BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160
> BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224
> SHA1E SHA1 MD5E MD5 WORM URL
> remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb
> tahoe glacier ddar hook external
> operating system: linux x86_64
> supported repository versions: 5 7
> upgrade supported from repository versions: 0 1 2 3 4 5 6
> local repository version: 7
> OK (0.11s)
> sync: On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> foo
> wanted . ok
> (recording state in git...)
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> 281ab61..7fbb21c 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 /<<PKGBUILDDIR>>/.t/repo
> 7fbb21c..961d6e8 git-annex -> synced/git-annex
> OK (0.66s)
> union merge regression: On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo137
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> From ../../.t/tmprepo136
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> To ../../.t/tmprepo137
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> To ../../.t/tmprepo136
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo138
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo136
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/git-annex -> r1/synced/git-annex
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo138
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo137
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/git-annex -> r2/synced/git-annex
> * [new branch] synced/master -> r2/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo138
> 1f5e228..5694483 git-annex -> r3/git-annex
> From ../../.t/tmprepo137
> 1f5e228..8ab78e3 git-annex -> r2/git-annex
> To ../../.t/tmprepo138
> * [new branch] git-annex -> synced/git-annex
> To ../../.t/tmprepo137
> 1f5e228..feca711 git-annex -> synced/git-annex
> OK (1.16s)
> adjusted branch merge regression: Switched to branch
> 'adjusted/master(unlocked)'
> [adjusted/master(unlocked) 27f1643] git-annex in .t/tmprepo139
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> From ../../.t/tmprepo140
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> To ../../.t/tmprepo140
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> Switched to branch 'adjusted/master(unlocked)'
> [adjusted/master(unlocked) 9983e4d] git-annex in .t/tmprepo140
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> Merge made by the 'recursive' strategy.
> Updating 9983e4d..f3cb36c
> Fast-forward
> From ../../.t/tmprepo139
> * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked)
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> To ../../.t/tmprepo139
> 1579899..666102b master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch adjusted/master(unlocked)
> nothing to commit, working tree clean
> Updating 1579899..666102b
> Fast-forward
> Updating 98a36ff..e68df5c
> Fast-forward
> From ../../.t/tmprepo140
> * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
> 437a356..9ec0fdf git-annex -> r2/git-annex
> cedeff2..666102b master -> r2/master
> 1579899..666102b synced/master -> r2/synced/master
> On branch adjusted/master(unlocked)
> nothing to commit, working tree clean
> From ../../.t/tmprepo139
> + 98a36ff...d6dee00 adjusted/master(unlocked) ->
> r1/adjusted/master(unlocked) (forced update)
> OK (1.40s)
> adjusted branch subtree regression: Switched to branch
> 'adjusted/master(unlocked)'
> [adjusted/master(unlocked) e316ccc] git-annex in .t/tmprepo141
> 1 file changed, 1 insertion(+)
> create mode 100644 a/b/c/d
> [adjusted/master(unlocked) 272a67d] git-annex in .t/tmprepo141
> 1 file changed, 1 insertion(+)
> create mode 100644 a/b/x/y
> Switched to branch 'master'
> OK (0.55s)
> conflict resolution: [master 56430a1]
> git-annex in .t/tmprepo142
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master ef5d3a4] git-annex in .t/tmprepo143
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo143
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master d75675a] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo143
> ef5d3a4..d75675a master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating ef5d3a4..d75675a
> 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
> From ../../.t/tmprepo142
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo143
> ef5d3a4..d75675a master -> r2/master
> conflictor.variant-a507
> conflictor.variant-75dc
> conflictor.variant-a507
> conflictor.variant-75dc
> OK (0.88s)
> conflict resolution (adjusted branch): [master 4d091bb]
> git-annex in .t/tmprepo144
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 046c31c] git-annex in .t/tmprepo145
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> Switched to branch 'adjusted/master(unlocked)'
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo145
> * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked)
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master b9b8f2f] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo145
> 046c31c..b9b8f2f master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch adjusted/master(unlocked)
> nothing to commit, working tree clean
> Updating 046c31c..b9b8f2f
> 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 caa67d7..560f159
> Fast-forward
> conflictor => conflictor.variant-75dc | 0
> conflictor.variant-a507 | 1 +
> 2 files changed, 1 insertion(+)
> rename conflictor => conflictor.variant-75dc (100%)
> create mode 100644 conflictor.variant-a507
> From ../../.t/tmprepo144
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo145
> + caa67d7...113015e adjusted/master(unlocked) ->
> r2/adjusted/master(unlocked) (forced update)
> conflictor.variant-a507
> conflictor.variant-75dc
> conflictor.variant-a507
> conflictor.variant-75dc
> OK (1.28s)
> conflict resolution movein regression: (recording state in
> git...)
> [master bfa0f78] git-annex in .t/tmprepo146
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rewrite foo (100%)
> mode change 120000 => 100644
> From ../../.t/tmprepo147
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> To ../../.t/tmprepo147
> * [new branch] git-annex -> synced/git-annex
> * [new branch] master -> synced/master
> (recording state in git...)
> [master b5cfdd9] git-annex in .t/tmprepo147
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rewrite foo (100%)
> mode change 120000 => 100644
> Auto-merging foo
> CONFLICT (content): Merge conflict in foo
> Automatic merge failed; fix conflicts and then commit the result.
> foo: needs merge
> [master 0ebbb40] 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
> bfa0f78..0ebbb40 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating bfa0f78..0ebbb40
> Fast-forward
> foo => foo.variant-0b0e | 0
> foo.variant-bc25 | 1 +
> 2 files changed, 1 insertion(+)
> rename foo => foo.variant-0b0e (100%)
> create mode 100644 foo.variant-bc25
> From ../../.t/tmprepo147
> 3379d8c..a10f6c1 git-annex -> r2/git-annex
> cedeff2..0ebbb40 master -> r2/master
> bfa0f78..0ebbb40 synced/master -> r2/synced/master
> OK (1.05s)
> conflict resolution (mixed directory and file): [master dfa6795]
> git-annex in .t/tmprepo148
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 7249c10] git-annex in .t/tmprepo149
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo149
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Adding conflictor/subfile
> CONFLICT (file/directory): There is a directory with name conflictor in
> refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master d6212d1] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo149
> 7249c10..d6212d1 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 7249c10..d6212d1
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo148
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> [master 253dadc] git-annex in .t/tmprepo150
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 34d8703] git-annex in .t/tmprepo151
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo150
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Adding conflictor/subfile
> CONFLICT (directory/file): There is a directory with name conflictor in HEAD.
> Adding conflictor as conflictor~refs_remotes_r1_master
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 6e9d33c] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo150
> 253dadc..6e9d33c master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 253dadc..6e9d33c
> Fast-forward
> conflictor => conflictor.variant-cc12 | 0
> conflictor/subfile | 1 +
> 2 files changed, 1 insertion(+)
> rename conflictor => conflictor.variant-cc12 (100%)
> create mode 120000 conflictor/subfile
> From ../../.t/tmprepo151
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> OK (1.63s)
> conflict resolution symlink bit: [master 8c32ab3]
> git-annex in .t/tmprepo152
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> To /<<PKGBUILDDIR>>/.t/repo
> 961d6e8..8ee7df6 git-annex -> synced/git-annex
> cedeff2..8c32ab3 master -> synced/master
> conflictor
> [master dda3624] git-annex in .t/tmprepo153
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/subfile
> From /<<PKGBUILDDIR>>/.t/repo
> 961d6e8..8ee7df6 git-annex -> origin/git-annex
> 961d6e8..8ee7df6 synced/git-annex -> origin/synced/git-annex
> cedeff2..8c32ab3 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 b2a60ac] git-annex automatic merge conflict fix
> To /<<PKGBUILDDIR>>/.t/repo
> 8ee7df6..1809766 git-annex -> synced/git-annex
> 8c32ab3..b2a60ac master -> synced/master
> conflictor/subfile
> [master 4ef330f] git-annex in .t/tmprepo154
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> From /<<PKGBUILDDIR>>/.t/repo
> 961d6e8..1809766 git-annex -> origin/git-annex
> 961d6e8..1809766 synced/git-annex -> origin/synced/git-annex
> cedeff2..b2a60ac 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 ff10c6e] git-annex automatic merge conflict fix
> To /<<PKGBUILDDIR>>/.t/repo
> 1809766..470ca09 git-annex -> synced/git-annex
> b2a60ac..ff10c6e master -> synced/master
> conflictor/subfile
> OK (1.06s)
> conflict resolution (uncommitted local file): [master aa10da4]
> git-annex in .t/tmprepo155
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> Untracked files:
> conflictor
>
> nothing added to commit but untracked files present
> From ../../.t/tmprepo155
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating cedeff2..aa10da4
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating cedeff2..aa10da4
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> To ../../.t/tmprepo155
> * [new branch] git-annex -> synced/git-annex
> ! [rejected] master -> synced/master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo155'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and integrate the remote changes
> hint: (e.g. 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> To ../../.t/tmprepo155
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo155'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to r1 failed.
> [master 078555d] git-annex in .t/tmprepo157
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor/file
> On branch master
> Untracked files:
> conflictor
>
> nothing added to commit but untracked files present
> From ../../.t/tmprepo157
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating cedeff2..078555d
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> Updating cedeff2..078555d
> error: The following untracked working tree files would be overwritten by
> merge:
> conflictor
> Please move or remove them before you merge.
> Aborting
> To ../../.t/tmprepo157
> * [new branch] git-annex -> synced/git-annex
> ! [rejected] master -> synced/master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo157'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and integrate the remote changes
> hint: (e.g. 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> To ../../.t/tmprepo157
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to '../../.t/tmprepo157'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to r1 failed.
> OK (0.97s)
> conflict resolution (removed file): [master 34d9a99]
> git-annex in .t/tmprepo159
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo159
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating cedeff2..34d9a99
> Fast-forward
> conflictor | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> Already up to date.
> To ../../.t/tmprepo159
> * [new branch] git-annex -> synced/git-annex
> [master fc75249] git-annex in .t/tmprepo159
> 1 file changed, 1 deletion(-)
> delete mode 120000 conflictor
> From ../../.t/tmprepo160
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> To ../../.t/tmprepo160
> 34d9a99..fc75249 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> (recording state in git...)
> [master 830c34f] 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 9dc4f6a] git-annex automatic merge conflict fix
> From ../../.t/tmprepo159
> a88b6e6..4b99232 git-annex -> r1/git-annex
> 34d9a99..fc75249 master -> r1/master
> 34d9a99..fc75249 synced/master -> r1/synced/master
> To ../../.t/tmprepo159
> a88b6e6..5efb2ee git-annex -> synced/git-annex
> fc75249..9dc4f6a master -> synced/master
> On branch master
> nothing to commit, working tree clean
> Updating fc75249..9dc4f6a
> Fast-forward
> conflictor.variant-0cbf | 1 +
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor.variant-0cbf
> From ../../.t/tmprepo160
> 4b99232..5efb2ee git-annex -> r2/git-annex
> 34d9a99..9dc4f6a master -> r2/master
> fc75249..9dc4f6a synced/master -> r2/synced/master
> [master 680d979] git-annex in .t/tmprepo161
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo161
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Updating cedeff2..680d979
> Fast-forward
> conflictor | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> Already up to date.
> To ../../.t/tmprepo161
> * [new branch] git-annex -> synced/git-annex
> (recording state in git...)
> [master f663b43] git-annex in .t/tmprepo162
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rewrite conflictor (100%)
> mode change 120000 => 100644
> To ../../.t/tmprepo161
> 5f32342..2fee0e4 git-annex -> synced/git-annex
> 680d979..f663b43 master -> synced/master
> [master e59202c] 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 b0fcccc] 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
> f663b43..b0fcccc master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating f663b43..b0fcccc
> Fast-forward
> conflictor => conflictor.variant-0cbf | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename conflictor => conflictor.variant-0cbf (100%)
> From ../../.t/tmprepo161
> 680d979..b0fcccc master -> r1/master
> f663b43..b0fcccc synced/master -> r1/synced/master
> OK (2.05s)
> conflict resolution (nonannexed file): [master af99427]
> git-annex in .t/tmprepo163
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master aefdb90] git-annex in .t/tmprepo164
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo164
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master f4336e1] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo164
> aefdb90..f4336e1 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating aefdb90..f4336e1
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo163
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master 0a6d81f] git-annex in .t/tmprepo165
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master f1adb7f] git-annex in .t/tmprepo166
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo165
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master e17b190] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo165
> 0a6d81f..e17b190 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 0a6d81f..e17b190
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> mode change 120000 => 100644 conflictor
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo166
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> [master 027bb98] git-annex in .t/tmprepo167
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 526cc5c] git-annex in .t/tmprepo168
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo168
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 3b2d99f] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo168
> 526cc5c..3b2d99f master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 526cc5c..3b2d99f
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo167
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master 33837a0] git-annex in .t/tmprepo169
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 4876a55] git-annex in .t/tmprepo170
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo169
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 712024a] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo169
> 33837a0..712024a master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 33837a0..712024a
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> mode change 120000 => 100644 conflictor
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo170
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> OK (3.13s)
> conflict resolution (nonannexed symlink): [master 935f4eb]
> git-annex in .t/tmprepo171
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master feafda1] git-annex in .t/tmprepo172
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo172
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master e51b228] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo172
> feafda1..e51b228 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating feafda1..e51b228
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo171
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master 8f59f61] git-annex in .t/tmprepo173
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 11d9466] git-annex in .t/tmprepo174
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo173
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master cbae58d] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo173
> 8f59f61..cbae58d master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 8f59f61..cbae58d
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo174
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> [master 44cf3c7] git-annex in .t/tmprepo175
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master bedc5bb] git-annex in .t/tmprepo176
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo176
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 2ae3133] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo176
> bedc5bb..2ae3133 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating bedc5bb..2ae3133
> Fast-forward
> conflictor.variant-cc12 | 1 +
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo175
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> [master d8b5b47] git-annex in .t/tmprepo177
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 18f431f] git-annex in .t/tmprepo178
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo177
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> [master 1004338] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo177
> d8b5b47..1004338 master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating d8b5b47..1004338
> Fast-forward
> conflictor | 2 +-
> conflictor.variant-cc12 | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> create mode 120000 conflictor.variant-cc12
> From ../../.t/tmprepo178
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> OK (2.73s)
> conflict resolution (mixed locked and unlocked file): [master 66c3ea2]
> git-annex in .t/tmprepo179
> 1 file changed, 1 insertion(+)
> create mode 120000 conflictor
> [master 658681b] git-annex in .t/tmprepo180
> 1 file changed, 1 insertion(+)
> create mode 100644 conflictor
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo180
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> 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 ec0eeaf] git-annex automatic merge conflict fix
> Already up to date.
> To ../../.t/tmprepo180
> 658681b..ec0eeaf master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> Updating 658681b..ec0eeaf
> Fast-forward
> From ../../.t/tmprepo179
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo180
> 658681b..ec0eeaf master -> r2/master
> conflictor
> conflictor
> OK (0.97s)
> map: OK (0.14s)
> uninit: Deleted branch
> git-annex (was ce63835).
> ExitSuccess
> OK (0.19s)
> uninit (in git-annex branch): Switched to branch
> 'git-annex'
> OK (0.29s)
> upgrade: OK (0.12s)
> whereis: OK (0.19s)
> hook remote: OK (0.29s)
> directory remote: OK (0.27s)
> rsync remote: OK (0.49s)
> bup remote: OK (0.12s)
> 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 (3.50s)
> preferred content: wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> OK (0.51s)
> add subdirs: [master a1be3c4]
> git-annex in .t/tmprepo194
> 1 file changed, 1 insertion(+)
> create mode 120000 dir/foo
> Merge made by the 'recursive' strategy.
> conflictor.variant-cc12 | 1 +
> conflictor/subfile | 1 +
> 2 files changed, 2 insertions(+)
> create mode 120000 conflictor.variant-cc12
> create mode 120000 conflictor/subfile
> To /<<PKGBUILDDIR>>/.t/repo
> 470ca09..4b92a1b git-annex -> synced/git-annex
> ff10c6e..0403772 master -> synced/master
> OK (0.41s)
> addurl: Configuration does
> not allow accessing file:///<<PKGBUILDDIR>>/.t/tmprepo195/myurl
> download failed: Configuration does not allow accessing
> file:///<<PKGBUILDDIR>>/.t/tmprepo195/myurl
> OK (0.19s)
> Unit Tests v5 direct
> add dup: Init Tests
> init: On branch master
>
> Initial commit
>
> nothing to commit
> OK (0.05s)
> add: fatal: this operation must be run in a work tree
> OK (0.08s)
>
> All 2 tests passed (0.14s)
> On branch master
> nothing to commit, working tree clean
> OK (0.11s)
> add extras: On branch master
> nothing to commit, working tree clean
> OK (0.11s)
> shared clone: On branch master
> nothing to commit, working tree clean
> OK (0.07s)
> log: On branch master
> nothing to commit, working tree clean
> + Sat, 16 Mar 2019 04:53:39 UTC foo | a49071bc-7287-4a6f-a14e-dad9625f6ec7 --
> test repo [origin]
> OK (0.09s)
> 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 (0.22s)
> reinject: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> unannex (no copy): On branch master
> nothing to commit, working tree clean
> OK (0.10s)
> unannex (with copy): On branch master
> nothing to commit, working tree clean
> OK (0.13s)
> drop (no remote): On branch master
> nothing to commit, working tree clean
> OK (0.16s)
> 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 (0.20s)
> drop (untrusted remote): On branch master
> nothing to commit, working tree clean
> OK (0.16s)
> get: On branch master
> nothing to commit, working tree clean
> OK (0.17s)
> get (ssh remote): On branch master
> nothing to commit, working tree clean
> OK (0.18s)
> move: On branch master
> nothing to commit, working tree clean
> OK (0.25s)
> move (ssh remote): On branch master
> nothing to commit, working tree clean
> OK (0.34s)
> copy: On branch master
> nothing to commit, working tree clean
> OK (0.25s)
> lock: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> lock (v7 --force): On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> edit (no pre-commit): On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> edit (pre-commit): On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> partial commit: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> fix: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> direct: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> trust: On branch master
> nothing to commit, working tree clean
> OK (0.23s)
> fsck (basics): On branch master
> nothing to commit, working tree clean
> numcopies 2 ok
> (recording state in git...)
> Only 1 of 2 trustworthy copies exist of foo
> Back it up with git-annex copy.
> Only 1 of 2 trustworthy copies exist of sha1foo
> Back it up with git-annex copy.
> numcopies 1 ok
> (recording state in git...)
> OK (0.27s)
> fsck (bare): OK (0.05s)
> fsck (local untrusted): On branch master
> nothing to commit, working tree clean
> Only these untrusted locations may have copies of foo
> 4f5e4698-7d12-4d9a-a43a-847fca6e1df4 -- .t/tmprepo222 [here]
> a49071bc-7287-4a6f-a14e-dad9625f6ec7 -- test repo [origin]
> Back it up to trusted locations with git-annex copy.
> Only these untrusted locations may have copies of sha1foo
> a49071bc-7287-4a6f-a14e-dad9625f6ec7 -- test repo [origin]
> Back it up to trusted locations with git-annex copy.
> OK (0.17s)
> fsck (remote untrusted): On branch master
> nothing to commit, working tree clean
> 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:
> a49071bc-7287-4a6f-a14e-dad9625f6ec7 -- 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:
> a49071bc-7287-4a6f-a14e-dad9625f6ec7 -- test repo [origin]
> OK (0.18s)
> fsck --from remote: On branch master
> nothing to commit, working tree clean
> OK (0.09s)
> migrate: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> migrate (via gitattributes): On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> unused: On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> describe: On branch master
> nothing to commit, working tree clean
> OK (0.11s)
> find: On branch master
> nothing to commit, working tree clean
> foo
> foo
> sha1foo
> sha1foo
> dir/subfile
> OK (0.38s)
> merge: On branch master
> nothing to commit, working tree clean
> OK (0.08s)
> info: On branch master
> nothing to commit, working tree clean
> {"local annex size":"0 bytes","size of annexed files in working tree":"45
> bytes","command":"info","untrusted
> repositories":[],"success":true,"semitrusted
> repositories":[{"here":false,"uuid":"00000000-0000-0000-0000-000000000001","description":"web"},{"here":false,"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent"},{"here":false,"uuid":"a49071bc-7287-4a6f-a14e-dad9625f6ec7","description":"test
> repo
> [origin]"},{"here":true,"uuid":"d0a511f0-2bf0-49d9-89fb-5495686bfcea","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":"91.88 gigabytes (+1 megabyte
> reserved)","annexed files in working tree":2,"file":null,"trusted
> repositories":[]}
> OK (0.11s)
> version: On branch master
> nothing to commit, working tree clean
> 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
> key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E
> SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E
> SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256
> BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224
> BLAKE2B384E BLAKE2B384 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160
> BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224
> SHA1E SHA1 MD5E MD5 WORM URL
> remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb
> tahoe glacier ddar hook external
> operating system: linux x86_64
> supported repository versions: 5 7
> upgrade supported from repository versions: 0 1 2 3 4 5 6
> local repository version: 5
> OK (0.08s)
> sync: On branch master
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> * [new branch] git-annex -> synced/git-annex
> foo
> wanted . ok
> (recording state in git...)
> To /<<PKGBUILDDIR>>/.t/repo
> 25e9a9c..7bed5fa git-annex -> synced/git-annex
> foo
> To /<<PKGBUILDDIR>>/.t/repo
> 7bed5fa..f3be306 git-annex -> synced/git-annex
> OK (0.57s)
> union merge regression: On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo235
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> From ../../.t/tmprepo234
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> To ../../.t/tmprepo235
> * [new branch] git-annex -> synced/git-annex
> * [new branch] annex/direct/master -> synced/master
> To ../../.t/tmprepo234
> * [new branch] git-annex -> synced/git-annex
> * [new branch] annex/direct/master -> synced/master
> From ../../.t/tmprepo236
> * [new branch] annex/direct/master -> r3/annex/direct/master
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo234
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/git-annex -> r1/synced/git-annex
> * [new branch] synced/master -> r1/synced/master
> From ../../.t/tmprepo236
> * [new branch] annex/direct/master -> r3/annex/direct/master
> * [new branch] git-annex -> r3/git-annex
> * [new branch] master -> r3/master
> * [new branch] synced/master -> r3/synced/master
> From ../../.t/tmprepo235
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/git-annex -> r2/synced/git-annex
> * [new branch] synced/master -> r2/synced/master
> From ../../.t/tmprepo236
> b34bc97..3ac48e4 git-annex -> r3/git-annex
> From ../../.t/tmprepo235
> b34bc97..49c8b88 git-annex -> r2/git-annex
> To ../../.t/tmprepo236
> * [new branch] git-annex -> synced/git-annex
> To ../../.t/tmprepo235
> b34bc97..b5fc0e5 git-annex -> synced/git-annex
> OK (0.99s)
> adjusted branch merge regression: On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> OK (0.20s)
> adjusted branch subtree regression: On branch master
> nothing to commit, working tree clean
> OK (0.07s)
> conflict resolution: On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo241
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Auto-merging conflictor
> CONFLICT (add/add): Merge conflict in conflictor
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo241
> 5f0a0ec..971a9b2 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo240
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> From ../../.t/tmprepo241
> 5f0a0ec..971a9b2 annex/direct/master -> r2/annex/direct/master
> conflictor.variant-a507
> conflictor.variant-75dc
> conflictor.variant-a507
> conflictor.variant-75dc
> OK (0.61s)
> conflict resolution (adjusted branch): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> OK (0.15s)
> conflict resolution movein regression: On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo245
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> To ../../.t/tmprepo245
> * [new branch] git-annex -> synced/git-annex
> * [new branch] annex/direct/master -> synced/master
> Auto-merging foo
> CONFLICT (content): Merge conflict in foo
> Automatic merge failed; fix conflicts and then commit the result.
> foo: needs merge
> From ../../.t/tmprepo244
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> To ../../.t/tmprepo244
> afb46fe..f7836de annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo245
> 7702862..f7836de annex/direct/master -> r2/annex/direct/master
> 1f261c9..c01a1a5 git-annex -> r2/git-annex
> afb46fe..f7836de master -> r2/master
> afb46fe..f7836de synced/master -> r2/synced/master
> OK (0.63s)
> conflict resolution (mixed directory and file): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo247
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> Adding conflictor/subfile
> CONFLICT (file/directory): There is a directory with name conflictor in
> refs/remotes/r2/master. Adding conflictor as conflictor~HEAD
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo247
> a870b3c..c447f7f annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo246
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo248
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Adding conflictor/subfile
> CONFLICT (directory/file): There is a directory with name conflictor in HEAD.
> Adding conflictor as conflictor~refs_remotes_r1_master
> Automatic merge failed; fix conflicts and then commit the result.
> conflictor: needs merge
> To ../../.t/tmprepo248
> 8436f65..7c5bb74 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> Adding conflictor/subfile
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo249
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> conflictor/subfile
> conflictor.variant-cc12
> conflictor/subfile
> conflictor.variant-cc12
> OK (1.21s)
> conflict resolution symlink bit: On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> To /<<PKGBUILDDIR>>/.t/repo
> f3be306..18c8d8c git-annex -> synced/git-annex
> 7702862..cf8296c annex/direct/master -> synced/master
> conflictor
> From /<<PKGBUILDDIR>>/.t/repo
> f3be306..18c8d8c git-annex -> origin/git-annex
> 7702862..cf8296c master -> origin/master
> f3be306..18c8d8c synced/git-annex -> origin/synced/git-annex
> 7702862..cf8296c 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 /<<PKGBUILDDIR>>/.t/repo
> 18c8d8c..041e877 git-annex -> synced/git-annex
> cf8296c..b2d2487 annex/direct/master -> synced/master
> conflictor/subfile
> From /<<PKGBUILDDIR>>/.t/repo
> f3be306..041e877 git-annex -> origin/git-annex
> 7702862..b2d2487 master -> origin/master
> f3be306..041e877 synced/git-annex -> origin/synced/git-annex
> 7702862..b2d2487 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 /<<PKGBUILDDIR>>/.t/repo
> 041e877..c2f747a git-annex -> synced/git-annex
> b2d2487..fa41130 annex/direct/master -> synced/master
> conflictor/subfile
> OK (0.89s)
> conflict resolution (uncommitted local file): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo253
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Automatic merge went well; stopped before committing as requested
> error: duplicate parent 3a74d9f25e697ab6fc9824b4b847b4027880cfad ignored
> To ../../.t/tmprepo253
> 3a74d9f..6409fd3 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo255
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Automatic merge went well; stopped before committing as requested
> error: duplicate parent e4feef6c81bdd8c9e88af1d893ffa7955dfde8bb ignored
> To ../../.t/tmprepo255
> e4feef6..2d351a6 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> OK (0.80s)
> conflict resolution (removed file): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo257
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Automatic merge went well; stopped before committing as requested
> error: duplicate parent dceacf85125bae5593683c1a77e73683c3de361b ignored
> To ../../.t/tmprepo257
> dceacf8..417dc9c 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
> From ../../.t/tmprepo258
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> To ../../.t/tmprepo258
> 417dc9c..397c94d 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
> dceacf8..397c94d annex/direct/master -> r1/annex/direct/master
> becfaec..4d3fbba git-annex -> r1/git-annex
> 417dc9c..397c94d master -> r1/master
> 417dc9c..397c94d synced/master -> r1/synced/master
> To ../../.t/tmprepo257
> becfaec..4d3fbba git-annex -> synced/git-annex
> 397c94d..a7f56b7 annex/direct/master -> synced/master
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo258
> 417dc9c..a7f56b7 annex/direct/master -> r2/annex/direct/master
> 4d3fbba..e449113 git-annex -> r2/git-annex
> 397c94d..a7f56b7 master -> r2/master
> 397c94d..a7f56b7 synced/master -> r2/synced/master
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo259
> * [new branch] annex/direct/master -> r1/annex/direct/master
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> Automatic merge went well; stopped before committing as requested
> error: duplicate parent 5c6d19544a1eadc9ec69cc17bbe631fa6a26f501 ignored
> To ../../.t/tmprepo259
> 5c6d195..f8ab199 annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> To ../../.t/tmprepo259
> 017cc7f..b7d3dba git-annex -> synced/git-annex
> f8ab199..8bff96a 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
> From ../../.t/tmprepo260
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> * [new branch] synced/master -> r2/synced/master
> To ../../.t/tmprepo260
> 8bff96a..1cbcb7f annex/direct/master -> synced/master
> * [new branch] git-annex -> synced/git-annex
> Automatic merge went well; stopped before committing as requested
> From ../../.t/tmprepo259
> 5c6d195..1cbcb7f annex/direct/master -> r1/annex/direct/master
> b7d3dba..c352425 git-annex -> r1/git-annex
> 8bff96a..1cbcb7f master -> r1/master
> 8bff96a..1cbcb7f synced/master -> r1/synced/master
> OK (1.59s)
> conflict resolution (nonannexed file): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> OK (0.65s)
> conflict resolution (nonannexed symlink): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> OK (0.61s)
> conflict resolution (mixed locked and unlocked file): On branch master
> nothing to commit, working tree clean
> On branch master
> nothing to commit, working tree clean
> From ../../.t/tmprepo278
> * [new branch] annex/direct/master -> r2/annex/direct/master
> * [new branch] git-annex -> r2/git-annex
> * [new branch] master -> r2/master
> Automatic merge went well; stopped before committing as requested
> error: duplicate parent fa411300ec53954bd1bc1f03630c79c02d9604df ignored
> To ../../.t/tmprepo278
> * [new branch] git-annex -> synced/git-annex
> * [new branch] annex/direct/master -> synced/master
> To /<<PKGBUILDDIR>>/.t/repo
> c2f747a..dac37b7 git-annex -> synced/git-annex
> fa41130..2e5ed22 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
> * [new branch] git-annex -> r1/git-annex
> * [new branch] master -> r1/master
> * [new branch] synced/master -> r1/synced/master
> From /<<PKGBUILDDIR>>/.t/repo
> c2f747a..dac37b7 git-annex -> origin/git-annex
> fa41130..2e5ed22 master -> origin/master
> c2f747a..dac37b7 synced/git-annex -> origin/synced/git-annex
> fa41130..2e5ed22 synced/master -> origin/synced/master
> From ../../.t/tmprepo278
> 7702862..2e5ed22 annex/direct/master -> r2/annex/direct/master
> OK (0.60s)
> map: On branch master
> nothing to commit, working tree clean
> OK (0.12s)
> uninit: On branch master
> nothing to commit, working tree clean
> Deleted branch git-annex (was 3b7918f).
> ExitSuccess
> OK (0.13s)
> uninit (in git-annex branch): On branch master
> nothing to commit, working tree clean
> not supported in direct mode; skipping
> OK (0.09s)
> upgrade: On branch master
> nothing to commit, working tree clean
> OK (0.16s)
> whereis: On branch master
> nothing to commit, working tree clean
> OK (0.16s)
> hook remote: On branch master
> nothing to commit, working tree clean
> OK (0.25s)
> directory remote: On branch master
> nothing to commit, working tree clean
> OK (0.24s)
> rsync remote: On branch master
> nothing to commit, working tree clean
> OK (0.46s)
> bup remote: On branch master
> nothing to commit, working tree clean
> OK (0.07s)
> 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.)
> initremote: 1 failed
> 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.)
> initremote: 1 failed
> 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.)
> initremote: 1 failed
> OK (3.41s)
> preferred content: On branch master
> nothing to commit, working tree clean
> wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> group . ok
> (recording state in git...)
> wanted . ok
> (recording state in git...)
> OK (0.47s)
> add subdirs: On branch master
> nothing to commit, working tree clean
> Automatic merge went well; stopped before committing as requested
> To /<<PKGBUILDDIR>>/.t/repo
> dac37b7..f812e3b git-annex -> synced/git-annex
> 2e5ed22..e220f89 annex/direct/master -> synced/master
> OK (0.30s)
> addurl: On branch master
> nothing to commit, working tree clean
> Configuration does not allow accessing
> file:///<<PKGBUILDDIR>>/.t/tmprepo293/myurl
> download failed: Configuration does not allow accessing
> file:///<<PKGBUILDDIR>>/.t/tmprepo293/myurl
> OK (0.13s)
>
> All 227 tests passed (93.48s)
> .t/gpgtest/1/S.gpg-agent.extra:
> removeDirectoryRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:getSymbolicLinkStatus:
> does not exist (No such file or directory)
> sleeping 10 seconds and will retry directory cleanup
> git-annex: .t/gpgtest/2/S.gpg-agent.extra:
> removeDirectoryRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:removeContentsRecursive:removePathRecursive:getSymbolicLinkStatus:
> does not exist (No such file or directory)
> make[1]: *** [Makefile:78: test] Error 1
> make[1]: Leaving directory '/<<PKGBUILDDIR>>'
> dh_auto_test: make -j1 test returned exit code 2
The full build log is available from:
http://aws-logs.debian.net/2019/03/15/git-annex_7.20190129-2_testing.log
A list of current common problems and possible solutions is available at
http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute!
About the archive rebuild: The rebuild was done on EC2 VM instances from
Amazon Web Services, using a clean, minimal and up-to-date chroot. Every
failed build was retried once to eliminate random failures.
