Skip to content

Instantly share code, notes, and snippets.

@ilovezfs

ilovezfs/gist:0cee6dc016b6b624c734

Created January 28, 2016 03:47
Show Gist options
  • Save ilovezfs/0cee6dc016b6b624c734 to your computer and use it in GitHub Desktop.
Save ilovezfs/0cee6dc016b6b624c734 to your computer and use it in GitHub Desktop.
Download ZIP
git-annex 6.20160126 on 10.11.2
Raw
gistfile1.txt
~ joe$ brew test --verbose git-annex
Testing git-annex
==> Using the sandbox
/usr/bin/sandbox-exec -f /tmp/homebrew20160127-91956-1dfbvfa.sb /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/bin/ruby -W0 -I /usr/local/Library/Homebrew -- /usr/local/Library/Homebrew/test.rb /usr/local/Library/Formula/git-annex.rb --verbose
==> git annex test
Tests
QuickCheck
prop_isomorphic_deencode_git: OK (0.48s)
+++ OK, passed 1000 tests.
prop_isomorphic_deencode: OK (0.13s)
+++ OK, passed 1000 tests.
prop_isomorphic_fileKey: OK (0.04s)
+++ OK, passed 1000 tests.
prop_isomorphic_key_encode: OK (0.05s)
+++ OK, passed 1000 tests.
prop_isomorphic_key_decode: OK (0.02s)
+++ OK, passed 1000 tests.
prop_isomorphic_shellEscape: OK (0.04s)
+++ OK, passed 1000 tests.
prop_isomorphic_shellEscape_multiword: OK (1.46s)
+++ OK, passed 1000 tests.
prop_isomorphic_configEscape: OK (0.04s)
+++ OK, passed 1000 tests.
prop_parse_show_Config: OK (0.08s)
+++ OK, passed 1000 tests.
prop_upFrom_basics: OK (0.03s)
+++ OK, passed 1000 tests.
prop_relPathDirToFile_basics: OK (0.04s)
+++ OK, passed 1000 tests.
prop_relPathDirToFile_regressionTest: OK
+++ OK, passed 1000 tests.
prop_cost_sane: OK
+++ OK, passed 1000 tests.
prop_matcher_sane: OK
+++ OK, passed 1000 tests.
prop_HmacSha1WithCipher_sane: OK
+++ OK, passed 1000 tests.
prop_TimeStamp_sane: OK
+++ OK, passed 1000 tests.
prop_addMapLog_sane: OK
+++ OK, passed 1000 tests.
prop_verifiable_sane: OK (0.14s)
+++ OK, passed 1000 tests.
prop_segment_regressionTest: OK
+++ OK, passed 1000 tests.
prop_read_write_transferinfo: OK (0.05s)
+++ OK, passed 1000 tests.
prop_read_show_inodecache: OK (0.01s)
+++ OK, passed 1000 tests.
prop_parse_show_log: OK (1.77s)
+++ OK, passed 1000 tests.
prop_read_show_TrustLevel: OK
+++ OK, passed 1000 tests.
prop_parse_show_TrustLog: OK
+++ OK, passed 1000 tests.
prop_hashes_stable: OK
+++ OK, passed 1000 tests.
prop_mac_stable: OK
+++ OK, passed 1000 tests.
prop_schedule_roundtrips: OK (0.02s)
+++ OK, passed 1000 tests.
prop_past_sane: OK
+++ OK, passed 1000 tests.
prop_duration_roundtrips: OK
+++ OK, passed 1000 tests.
prop_metadata_sane: OK (1.02s)
+++ OK, passed 1000 tests.
prop_metadata_serialize: OK (1.44s)
+++ OK, passed 1000 tests.
prop_branchView_legal: OK (7.40s)
+++ OK, passed 1000 tests.
prop_viewPath_roundtrips: OK (0.06s)
+++ OK, passed 1000 tests.
prop_view_roundtrips: OK (0.47s)
+++ OK, passed 1000 tests.
prop_viewedFile_rountrips: OK (0.03s)
+++ OK, passed 1000 tests.
prop_b64_roundtrips: OK
+++ OK, passed 1000 tests.
prop_standardGroups_parse: OK
+++ OK, passed 1000 tests.
Unit Tests v6 unlocked
Init Tests
init: add dup: OK (0.14s)
add: (recording state in git...)
OK (0.59s)
All 2 tests passed (0.73s)
OK (0.41s)
add extras: OK (0.56s)
shared clone: OK (0.25s)
log: + 2016-01-27 19:38:52 foo | 3229ea61-8db6-4619-b5c5-2ecc5e68efaa -- test repo [origin]
OK (0.29s)
import: OK (0.79s)
reinject: OK (0.62s)
unannex (no copy): OK (0.32s)
unannex (with copy): OK (0.43s)
drop (no remote): OK (0.47s)
drop (with remote): OK (0.73s)
drop (untrusted remote): OK (0.48s)
get: OK (0.49s)
move: OK (0.81s)
copy: OK (0.75s)
lock: OK (0.98s)
edit (no pre-commit): (recording state in git...)
OK (0.70s)
edit (pre-commit): OK (0.67s)
partial commit: (recording state in git...)
OK (0.61s)
fix: OK (0.39s)
direct: OK (0.42s)
trust: OK (0.80s)
fsck (basics): 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.
OK (0.80s)
fsck (bare): OK (0.19s)
fsck (local untrusted): Only these untrusted locations may have copies of foo
3229ea61-8db6-4619-b5c5-2ecc5e68efaa -- test repo [origin]
684bcc89-b486-4942-a8c7-4d5e588d72a8 -- .t/tmprepo23 [here]
Back it up to trusted locations with git-annex copy.
Only these untrusted locations may have copies of sha1foo
3229ea61-8db6-4619-b5c5-2ecc5e68efaa -- test repo [origin]
Back it up to trusted locations with git-annex copy.
OK (0.59s)
fsck (remote untrusted): Only 1 of 2 trustworthy copies exist of foo
Back it up with git-annex copy.
The following untrusted locations may also have copies:
3229ea61-8db6-4619-b5c5-2ecc5e68efaa -- 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:
3229ea61-8db6-4619-b5c5-2ecc5e68efaa -- test repo [origin]
OK (0.57s)
fsck --from remote: OK (0.32s)
migrate: OK (1.05s)
migrate (via gitattributes): OK (1.07s)
unused: OK (1.36s)
describe: OK (0.33s)
find: foo
foo
sha1foo
sha1foo
dir/subfile
OK (1.05s)
merge: OK (0.28s)
info: {"command":"info","repository mode":"indirect","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent","here":false},{"uuid":"2694daf9-b2a8-4371-bade-f50ae2d7e85a","description":".t/tmprepo32","here":true},{"uuid":"3229ea61-8db6-4619-b5c5-2ecc5e68efaa","description":"test repo [origin]","here":false}],"untrusted repositories":[],"transfers in progress":[],"available local disk space":"25.01 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","annexed files in working tree":2,"size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","backend usage":{"SHA1":1,"SHA256E":1},"success":true}
OK (0.34s)
version: git-annex version: 6.20160126
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents XMPP ConcurrentOutput TorrentParser Feeds Quvi
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 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 6
supported repository versions: 5 6
upgrade supported from repository versions: 0 1 2 4 5
OK (0.26s)
sync: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
OK (0.54s)
union merge regression: From ../../.t/tmprepo36
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
From ../../.t/tmprepo35
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
To ../../.t/tmprepo36
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
To ../../.t/tmprepo35
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
From ../../.t/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo35
* [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/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo36
* [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/tmprepo37
781bf45..6fe8f7f git-annex -> r3/git-annex
From ../../.t/tmprepo36
781bf45..eb63ec3 git-annex -> r2/git-annex
To ../../.t/tmprepo37
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo36
781bf45..b594f92 git-annex -> synced/git-annex
OK (2.77s)
conflict resolution: From ../../.t/tmprepo39
* [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 1da4f7a] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo39
6f2bcdf..1da4f7a master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 6f2bcdf..1da4f7a
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/tmprepo38
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo39
6f2bcdf..1da4f7a master -> r2/master
conflictor.variant-75dc
conflictor.variant-a507
conflictor.variant-75dc
conflictor.variant-a507
OK (2.37s)
conflict resolution movein regression: From ../../.t/tmprepo41
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
To ../../.t/tmprepo41
* [new branch] git-annex -> synced/git-annex
* [new branch] 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
[master 4145c8a] git-annex automatic merge conflict fix
From ../../.t/tmprepo40
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
To ../../.t/tmprepo40
08cebaa..4145c8a master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 08cebaa..4145c8a
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/tmprepo41
609a9da..b19fb09 git-annex -> r2/git-annex
3e63784..4145c8a master -> r2/master
08cebaa..4145c8a synced/master -> r2/synced/master
OK (2.72s)
conflict resolution (mixed directory and file): From ../../.t/tmprepo43
* [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 de6e2a4] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo43
25f8508..de6e2a4 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 25f8508..de6e2a4
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo42
* [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
From ../../.t/tmprepo44
* [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 a8b2566] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo44
b36cf75..a8b2566 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating b36cf75..a8b2566
Fast-forward
conflictor => conflictor.variant-cc12 | 0
conflictor/subfile | 1 +
2 files changed, 1 insertion(+)
rename conflictor => conflictor.variant-cc12 (100%)
create mode 100644 conflictor/subfile
From ../../.t/tmprepo45
* [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 (4.93s)
conflict resolution symlink bit: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
e16ba68..5af55dc git-annex -> synced/git-annex
3e63784..b143db6 master -> synced/master
conflictor
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
e16ba68..5af55dc git-annex -> origin/git-annex
e16ba68..5af55dc synced/git-annex -> origin/synced/git-annex
3e63784..b143db6 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 cbd863e] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
5af55dc..27c28d1 git-annex -> synced/git-annex
b143db6..cbd863e master -> synced/master
conflictor/subfile
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
e16ba68..27c28d1 git-annex -> origin/git-annex
e16ba68..27c28d1 synced/git-annex -> origin/synced/git-annex
3e63784..cbd863e 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 c0bb540] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
27c28d1..ad242a7 git-annex -> synced/git-annex
cbd863e..c0bb540 master -> synced/master
conflictor/subfile
OK (2.16s)
conflict resolution (uncommitted local file): From ../../.t/tmprepo49
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 3e63784..06ae0de
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 3e63784..06ae0de
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
To ../../.t/tmprepo49
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo49'
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.
Pushing to r1 failed.
From ../../.t/tmprepo51
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 3e63784..e03a9e8
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 3e63784..e03a9e8
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
To ../../.t/tmprepo51
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo51'
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.
Pushing to r1 failed.
OK (2.86s)
conflict resolution (removed file): From ../../.t/tmprepo53
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 3e63784..b0e6bac
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor
Already up-to-date.
To ../../.t/tmprepo53
* [new branch] git-annex -> synced/git-annex
From ../../.t/tmprepo54
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo54
b0e6bac..74e86f4 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
[master c2b0d99] git-annex automatic merge conflict fix
From ../../.t/tmprepo53
94626a1..b2aceb4 git-annex -> r1/git-annex
b0e6bac..74e86f4 master -> r1/master
b0e6bac..74e86f4 synced/master -> r1/synced/master
To ../../.t/tmprepo53
94626a1..9d9fd6a git-annex -> synced/git-annex
74e86f4..c2b0d99 master -> synced/master
Updating 74e86f4..c2b0d99
Fast-forward
conflictor.variant-0cbf | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-0cbf
From ../../.t/tmprepo54
b2aceb4..9d9fd6a git-annex -> r2/git-annex
b0e6bac..c2b0d99 master -> r2/master
74e86f4..c2b0d99 synced/master -> r2/synced/master
From ../../.t/tmprepo55
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 3e63784..e3d9084
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor
Already up-to-date.
To ../../.t/tmprepo55
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo55
30b132e..0504ac3 git-annex -> synced/git-annex
e3d9084..8a18ee5 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
[master 178ebac] git-annex automatic merge conflict fix
From ../../.t/tmprepo56
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo56
8a18ee5..178ebac master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 8a18ee5..178ebac
Fast-forward
conflictor => conflictor.variant-0cbf | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename conflictor => conflictor.variant-0cbf (100%)
From ../../.t/tmprepo55
e3d9084..178ebac master -> r1/master
8a18ee5..178ebac synced/master -> r1/synced/master
OK (5.04s)
conflict resolution (nonannexed file): From ../../.t/tmprepo58
* [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 ed3343c] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo58
6b0d610..ed3343c master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 6b0d610..ed3343c
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo57
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo59
* [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 29c0d6e] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo59
cb44c3c..29c0d6e master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating cb44c3c..29c0d6e
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo60
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
From ../../.t/tmprepo62
* [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 6b371d6] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo62
a162d20..6b371d6 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating a162d20..6b371d6
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo61
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo63
* [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 4cb4658] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo63
48f156b..4cb4658 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 48f156b..4cb4658
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo64
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
OK (8.53s)
conflict resolution (nonannexed symlink): From ../../.t/tmprepo66
* [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 2c9323b] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo66
ff4f9a6..2c9323b master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating ff4f9a6..2c9323b
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 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
From ../../.t/tmprepo67
* [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 c243cfe] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo67
cc227db..c243cfe master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating cc227db..c243cfe
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
mode change 100644 => 120000 conflictor
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo68
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
From ../../.t/tmprepo70
* [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 1d01e9e] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo70
8f2b32f..1d01e9e master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 8f2b32f..1d01e9e
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo69
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo71
* [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 51d9c78] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo71
8efae6f..51d9c78 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 8efae6f..51d9c78
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
mode change 100644 => 120000 conflictor
create mode 100644 conflictor.variant-cc12
From ../../.t/tmprepo72
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
OK (7.78s)
conflict resolution (mixed locked and unlocked file): 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.
[master 181f768] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo74
fd37af2..181f768 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating fd37af2..181f768
Fast-forward
From ../../.t/tmprepo73
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo74
fd37af2..181f768 master -> r2/master
conflictor
conflictor
OK (2.34s)
map: OK (0.42s)
uninit: Deleted branch git-annex (was 1b11651).
OK (11.32s)
uninit (in git-annex branch): Switched to branch 'git-annex'
OK (0.69s)
upgrade: OK (0.32s)
whereis: OK (0.56s)
hook remote: OK (0.83s)
directory remote: OK (0.79s)
rsync remote: OK (0.85s)
bup remote: OK (0.31s)
crypto: OK (0.96s)
preferred content: OK (1.52s)
add subdirs: 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 /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
ad242a7..2951b7a git-annex -> synced/git-annex
c0bb540..fc2696e master -> synced/master
OK (1.16s)
addurl: OK (0.65s)
Unit Tests v6 locked
add dup: Init Tests
init: OK (0.11s)
add: OK (0.29s)
All 2 tests passed (0.41s)
OK (0.35s)
add extras: OK (0.33s)
shared clone: OK (0.19s)
log: + 2016-01-27 19:40:19 foo | 43202054-88cb-4e84-a3e9-6e06f3d81df2 -- test repo [origin]
OK (0.23s)
import: OK (0.67s)
reinject: OK (0.49s)
unannex (no copy): OK (0.27s)
unannex (with copy): OK (0.32s)
drop (no remote): OK (0.42s)
drop (with remote): OK (0.55s)
drop (untrusted remote): OK (0.42s)
get: OK (0.46s)
move: OK (0.76s)
copy: OK (0.71s)
lock: content not present; cannot unlock
OK (0.81s)
edit (no pre-commit): (recording state in git...)
OK (0.69s)
edit (pre-commit): OK (0.58s)
partial commit: (recording state in git...)
OK (0.60s)
fix: OK (0.56s)
direct: OK (0.38s)
trust: OK (0.73s)
fsck (basics): 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.
Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
OK (0.74s)
fsck (bare): OK (0.19s)
fsck (local untrusted): Only these untrusted locations may have copies of foo
43202054-88cb-4e84-a3e9-6e06f3d81df2 -- test repo [origin]
66ce3cec-eddc-4531-a8dc-bc2a2fe9a973 -- .t/tmprepo23 [here]
Back it up to trusted locations with git-annex copy.
Only these untrusted locations may have copies of sha1foo
43202054-88cb-4e84-a3e9-6e06f3d81df2 -- test repo [origin]
Back it up to trusted locations with git-annex copy.
OK (0.51s)
fsck (remote untrusted): Only 1 of 2 trustworthy copies exist of foo
Back it up with git-annex copy.
The following untrusted locations may also have copies:
43202054-88cb-4e84-a3e9-6e06f3d81df2 -- 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:
43202054-88cb-4e84-a3e9-6e06f3d81df2 -- test repo [origin]
OK (0.51s)
fsck --from remote: OK (0.27s)
migrate: OK (0.98s)
migrate (via gitattributes): OK (0.97s)
unused: OK (1.35s)
describe: OK (0.28s)
find: foo
foo
sha1foo
sha1foo
dir/subfile
OK (0.93s)
merge: OK (0.23s)
info: {"command":"info","repository mode":"indirect","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent","here":false},{"uuid":"43202054-88cb-4e84-a3e9-6e06f3d81df2","description":"test repo [origin]","here":false},{"uuid":"9982fe08-33ba-4dbe-bddd-41051285130f","description":".t/tmprepo32","here":true}],"untrusted repositories":[],"transfers in progress":[],"available local disk space":"25.01 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","annexed files in working tree":2,"size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","backend usage":{"SHA1":1,"SHA256E":1},"success":true}
OK (0.29s)
version: git-annex version: 6.20160126
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents XMPP ConcurrentOutput TorrentParser Feeds Quvi
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 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 6
supported repository versions: 5 6
upgrade supported from repository versions: 0 1 2 4 5
OK (0.23s)
sync: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
OK (0.45s)
union merge regression: From ../../.t/tmprepo36
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
From ../../.t/tmprepo35
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
To ../../.t/tmprepo36
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
To ../../.t/tmprepo35
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
From ../../.t/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo35
* [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/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo36
* [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/tmprepo37
450a834..4c8ff84 git-annex -> r3/git-annex
From ../../.t/tmprepo36
450a834..212c056 git-annex -> r2/git-annex
To ../../.t/tmprepo37
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo36
450a834..776966b git-annex -> synced/git-annex
OK (2.37s)
conflict resolution: From ../../.t/tmprepo39
* [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 fa42508] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo39
86070f4..fa42508 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 86070f4..fa42508
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/tmprepo38
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo39
86070f4..fa42508 master -> r2/master
conflictor.variant-75dc
conflictor.variant-a507
conflictor.variant-75dc
conflictor.variant-a507
OK (1.68s)
conflict resolution movein regression: From ../../.t/tmprepo41
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
To ../../.t/tmprepo41
* [new branch] git-annex -> synced/git-annex
* [new branch] 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
[master df611dc] git-annex automatic merge conflict fix
From ../../.t/tmprepo40
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
To ../../.t/tmprepo40
c2a196e..df611dc master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating c2a196e..df611dc
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/tmprepo41
181b9ad..82209bc git-annex -> r2/git-annex
41766d2..df611dc master -> r2/master
c2a196e..df611dc synced/master -> r2/synced/master
OK (2.04s)
conflict resolution (mixed directory and file): From ../../.t/tmprepo43
* [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 6c78567] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo43
39c82df..6c78567 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 39c82df..6c78567
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo42
* [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
From ../../.t/tmprepo44
* [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 2db5382] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo44
34cb4ff..2db5382 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 34cb4ff..2db5382
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/tmprepo45
* [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 (3.11s)
conflict resolution symlink bit: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
4c66f19..c11a6e9 git-annex -> synced/git-annex
41766d2..9f1ea5b master -> synced/master
conflictor
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
4c66f19..c11a6e9 git-annex -> origin/git-annex
4c66f19..c11a6e9 synced/git-annex -> origin/synced/git-annex
41766d2..9f1ea5b 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 c85aa4b] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
c11a6e9..18867cd git-annex -> synced/git-annex
9f1ea5b..c85aa4b master -> synced/master
conflictor/subfile
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
4c66f19..18867cd git-annex -> origin/git-annex
4c66f19..18867cd synced/git-annex -> origin/synced/git-annex
41766d2..c85aa4b 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 38c6d1c] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
18867cd..22c39a0 git-annex -> synced/git-annex
c85aa4b..38c6d1c master -> synced/master
conflictor/subfile
OK (1.87s)
conflict resolution (uncommitted local file): From ../../.t/tmprepo49
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 41766d2..b03f10d
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 41766d2..b03f10d
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
To ../../.t/tmprepo49
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo49'
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.
Pushing to r1 failed.
From ../../.t/tmprepo51
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 41766d2..84e08c0
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 41766d2..84e08c0
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
To ../../.t/tmprepo51
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo51'
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.
Pushing to r1 failed.
OK (2.15s)
conflict resolution (removed file): From ../../.t/tmprepo53
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 41766d2..b26023d
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor
Already up-to-date.
To ../../.t/tmprepo53
* [new branch] git-annex -> synced/git-annex
From ../../.t/tmprepo54
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo54
b26023d..cb29836 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
[master b178712] git-annex automatic merge conflict fix
From ../../.t/tmprepo53
7551286..b336eb1 git-annex -> r1/git-annex
b26023d..cb29836 master -> r1/master
b26023d..cb29836 synced/master -> r1/synced/master
To ../../.t/tmprepo53
7551286..fa0048f git-annex -> synced/git-annex
cb29836..b178712 master -> synced/master
Updating cb29836..b178712
Fast-forward
conflictor.variant-0cbf | 1 +
1 file changed, 1 insertion(+)
create mode 100644 conflictor.variant-0cbf
From ../../.t/tmprepo54
b336eb1..fa0048f git-annex -> r2/git-annex
b26023d..b178712 master -> r2/master
cb29836..b178712 synced/master -> r2/synced/master
From ../../.t/tmprepo55
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 41766d2..66d646f
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor
Already up-to-date.
To ../../.t/tmprepo55
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo55
c3f1a82..1b26a43 git-annex -> synced/git-annex
66d646f..d9b6aa9 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
[master a04daad] git-annex automatic merge conflict fix
From ../../.t/tmprepo56
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo56
d9b6aa9..a04daad master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating d9b6aa9..a04daad
Fast-forward
conflictor => conflictor.variant-0cbf | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename conflictor => conflictor.variant-0cbf (100%)
From ../../.t/tmprepo55
66d646f..a04daad master -> r1/master
d9b6aa9..a04daad synced/master -> r1/synced/master
OK (4.10s)
conflict resolution (nonannexed file): From ../../.t/tmprepo58
* [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 718da4d] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo58
9aa33df..718da4d master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 9aa33df..718da4d
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo57
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo59
* [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 7d0fa07] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo59
213dd2f..7d0fa07 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 213dd2f..7d0fa07
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/tmprepo60
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
From ../../.t/tmprepo62
* [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 2fcd64d] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo62
129b3c7..2fcd64d master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 129b3c7..2fcd64d
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo61
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo63
* [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 f379ffd] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo63
1455824..f379ffd master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 1455824..f379ffd
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/tmprepo64
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
OK (6.57s)
conflict resolution (nonannexed symlink): From ../../.t/tmprepo66
* [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 02fbd40] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo66
c0463e7..02fbd40 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating c0463e7..02fbd40
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
From ../../.t/tmprepo67
* [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 225bcda] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo67
26fdb91..225bcda master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 26fdb91..225bcda
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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
From ../../.t/tmprepo70
* [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 ccc5985] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo70
a911150..ccc5985 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating a911150..ccc5985
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo69
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo71
* [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 9c54f39] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo71
14f3c96..9c54f39 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 14f3c96..9c54f39
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo72
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
OK (5.48s)
conflict resolution (mixed locked and unlocked file): 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.
[master 6e267cc] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo74
77a413f..6e267cc master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 77a413f..6e267cc
Fast-forward
From ../../.t/tmprepo73
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo74
77a413f..6e267cc master -> r2/master
conflictor
conflictor
OK (1.87s)
map: OK (0.36s)
uninit: Deleted branch git-annex (was eae79c0).
OK (11.34s)
uninit (in git-annex branch): Switched to branch 'git-annex'
OK (0.46s)
upgrade: OK (0.27s)
whereis: OK (0.52s)
hook remote: OK (0.75s)
directory remote: OK (0.74s)
rsync remote: OK (0.77s)
bup remote: OK (0.26s)
crypto: OK (0.79s)
preferred content: OK (1.44s)
add subdirs: 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 /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
22c39a0..45aa356 git-annex -> synced/git-annex
38c6d1c..88a2809 master -> synced/master
OK (0.60s)
addurl: OK (0.49s)
Unit Tests v5
add dup: Init Tests
init: OK (0.10s)
add: OK (0.21s)
All 2 tests passed (0.31s)
OK (0.26s)
add extras: OK (0.23s)
shared clone: OK (0.17s)
log: + 2016-01-27 19:41:31 foo | 8b86c816-2835-4ce0-a863-2a4f9ea4d8ea -- test repo [origin]
OK (0.17s)
import: OK (0.55s)
reinject: OK (0.38s)
unannex (no copy): OK (0.23s)
unannex (with copy): OK (0.32s)
drop (no remote): OK (0.37s)
drop (with remote): OK (0.49s)
drop (untrusted remote): OK (0.37s)
get: OK (0.39s)
move: OK (0.72s)
copy: OK (0.65s)
lock: content not present; cannot unlock
this has not yet been committed to git; cannot unlock it
OK (0.64s)
edit (no pre-commit): add foo ok
ok
(recording state in git...)
OK (0.44s)
edit (pre-commit): OK (0.41s)
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.33s)
fix: OK (0.41s)
direct: On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
ok
On branch annex/direct/master
Changes not staged for commit:
typechange: foo
no changes added to commit
OK (0.47s)
trust: OK (0.68s)
fsck (basics): 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.
Bad file size (11 B larger); moved to .git/annex/bad/SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
Bad file size (11 B larger); moved to .git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
OK (0.69s)
fsck (bare): OK (0.16s)
fsck (local untrusted): Only these untrusted locations may have copies of foo
19607a7c-24ea-4ea6-b6ba-72913f7c4c84 -- .t/tmprepo23 [here]
8b86c816-2835-4ce0-a863-2a4f9ea4d8ea -- test repo [origin]
Back it up to trusted locations with git-annex copy.
Only these untrusted locations may have copies of sha1foo
8b86c816-2835-4ce0-a863-2a4f9ea4d8ea -- test repo [origin]
Back it up to trusted locations with git-annex copy.
OK (0.46s)
fsck (remote untrusted): Only 1 of 2 trustworthy copies exist of foo
Back it up with git-annex copy.
The following untrusted locations may also have copies:
8b86c816-2835-4ce0-a863-2a4f9ea4d8ea -- 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:
8b86c816-2835-4ce0-a863-2a4f9ea4d8ea -- test repo [origin]
OK (0.45s)
fsck --from remote: OK (0.22s)
migrate: OK (0.78s)
migrate (via gitattributes): OK (0.80s)
unused: OK (1.00s)
describe: OK (0.23s)
find: foo
foo
sha1foo
sha1foo
dir/subfile
OK (0.79s)
merge: OK (0.19s)
info: {"command":"info","repository mode":"indirect","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent","here":false},{"uuid":"8b86c816-2835-4ce0-a863-2a4f9ea4d8ea","description":"test repo [origin]","here":false},{"uuid":"926b6404-15cb-4877-9cce-0b9cdbacbd7d","description":".t/tmprepo32","here":true}],"untrusted repositories":[],"transfers in progress":[],"available local disk space":"25.01 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","annexed files in working tree":2,"size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","backend usage":{"SHA1":1,"SHA256E":1},"success":true}
OK (0.23s)
version: git-annex version: 6.20160126
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents XMPP ConcurrentOutput TorrentParser Feeds Quvi
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 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 5
supported repository versions: 5 6
upgrade supported from repository versions: 0 1 2 4 5
OK (0.17s)
sync: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
OK (0.36s)
union merge regression: From ../../.t/tmprepo36
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
From ../../.t/tmprepo35
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
To ../../.t/tmprepo36
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
To ../../.t/tmprepo35
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
From ../../.t/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo35
* [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/tmprepo37
* [new branch] git-annex -> r3/git-annex
* [new branch] master -> r3/master
* [new branch] synced/master -> r3/synced/master
From ../../.t/tmprepo36
* [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/tmprepo37
f88115b..61f3115 git-annex -> r3/git-annex
From ../../.t/tmprepo36
f88115b..a66b5a7 git-annex -> r2/git-annex
To ../../.t/tmprepo37
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo36
f88115b..5fd967e git-annex -> synced/git-annex
OK (2.20s)
conflict resolution: From ../../.t/tmprepo39
* [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 a395fd1] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo39
09d50e7..a395fd1 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 09d50e7..a395fd1
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/tmprepo38
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo39
09d50e7..a395fd1 master -> r2/master
conflictor.variant-75dc
conflictor.variant-a507
conflictor.variant-75dc
conflictor.variant-a507
OK (1.35s)
conflict resolution movein regression: From ../../.t/tmprepo41
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
To ../../.t/tmprepo41
* [new branch] git-annex -> synced/git-annex
* [new branch] 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
[master e91eadc] git-annex automatic merge conflict fix
From ../../.t/tmprepo40
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
To ../../.t/tmprepo40
f032ad1..e91eadc master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating f032ad1..e91eadc
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/tmprepo41
015d327..4f04c0a git-annex -> r2/git-annex
9868d8c..e91eadc master -> r2/master
f032ad1..e91eadc synced/master -> r2/synced/master
OK (1.39s)
conflict resolution (mixed directory and file): From ../../.t/tmprepo43
* [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 e19d6ad] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo43
640a58a..e19d6ad master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 640a58a..e19d6ad
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo42
* [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
From ../../.t/tmprepo44
* [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 5952d20] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo44
51d946f..5952d20 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 51d946f..5952d20
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/tmprepo45
* [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 (2.58s)
conflict resolution symlink bit: To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
dc76ba5..53bb0cd git-annex -> synced/git-annex
9868d8c..056b1f8 master -> synced/master
conflictor
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
dc76ba5..53bb0cd git-annex -> origin/git-annex
dc76ba5..53bb0cd synced/git-annex -> origin/synced/git-annex
9868d8c..056b1f8 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 ba3a547] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
53bb0cd..375c4d7 git-annex -> synced/git-annex
056b1f8..ba3a547 master -> synced/master
conflictor/subfile
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
dc76ba5..375c4d7 git-annex -> origin/git-annex
dc76ba5..375c4d7 synced/git-annex -> origin/synced/git-annex
9868d8c..ba3a547 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 026b0e7] git-annex automatic merge conflict fix
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
375c4d7..5ee2bdc git-annex -> synced/git-annex
ba3a547..026b0e7 master -> synced/master
conflictor/subfile
OK (1.59s)
conflict resolution (uncommitted local file): From ../../.t/tmprepo49
* [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 can merge.
Aborting
Updating 9868d8c..bf2a956
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 9868d8c..bf2a956
To ../../.t/tmprepo49
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo49'
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.
Pushing to r1 failed.
From ../../.t/tmprepo51
* [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 can merge.
Aborting
Updating 9868d8c..37585ad
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 9868d8c..37585ad
To ../../.t/tmprepo51
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo51'
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.
Pushing to r1 failed.
OK (1.67s)
conflict resolution (removed file): From ../../.t/tmprepo53
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 9868d8c..2ce0599
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor
Already up-to-date.
To ../../.t/tmprepo53
* [new branch] git-annex -> synced/git-annex
From ../../.t/tmprepo54
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo54
2ce0599..9792c34 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
[master 8421a85] git-annex automatic merge conflict fix
From ../../.t/tmprepo53
b4e8293..3fe17c3 git-annex -> r1/git-annex
2ce0599..9792c34 master -> r1/master
2ce0599..9792c34 synced/master -> r1/synced/master
To ../../.t/tmprepo53
b4e8293..c015f07 git-annex -> synced/git-annex
9792c34..8421a85 master -> synced/master
Updating 9792c34..8421a85
Fast-forward
conflictor.variant-0cbf | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-0cbf
From ../../.t/tmprepo54
3fe17c3..c015f07 git-annex -> r2/git-annex
2ce0599..8421a85 master -> r2/master
9792c34..8421a85 synced/master -> r2/synced/master
From ../../.t/tmprepo55
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 9868d8c..a0ce240
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor
Already up-to-date.
To ../../.t/tmprepo55
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo55
ba17631..ffe7a47 git-annex -> synced/git-annex
a0ce240..ac1467a 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
[master cc10325] git-annex automatic merge conflict fix
From ../../.t/tmprepo56
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
To ../../.t/tmprepo56
ac1467a..cc10325 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating ac1467a..cc10325
Fast-forward
conflictor => conflictor.variant-0cbf | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename conflictor => conflictor.variant-0cbf (100%)
From ../../.t/tmprepo55
a0ce240..cc10325 master -> r1/master
ac1467a..cc10325 synced/master -> r1/synced/master
OK (3.07s)
conflict resolution (nonannexed file): From ../../.t/tmprepo58
* [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 285e4f9] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo58
bf32be7..285e4f9 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating bf32be7..285e4f9
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo57
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo59
* [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 07e0b76] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo59
5b0e687..07e0b76 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 5b0e687..07e0b76
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/tmprepo60
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo62
* [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/tmprepo62
c338970..78f2f74 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory clean
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo61
* [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
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo63
* [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/tmprepo63
4d281b0..cccb814 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory clean
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo64
* [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
OK (4.76s)
conflict resolution (nonannexed symlink): From ../../.t/tmprepo66
* [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 7a9bfa7] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo66
69d6589..7a9bfa7 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 69d6589..7a9bfa7
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
From ../../.t/tmprepo67
* [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 339753e] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo67
eefe5c3..339753e master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating eefe5c3..339753e
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo70
* [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/tmprepo70
4803955..74a3456 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory 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
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo71
* [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/tmprepo71
5eadeb6..728bca5 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory 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
OK (4.75s)
conflict resolution (mixed locked and unlocked file): From ../../.t/tmprepo74
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
Updating 9868d8c..026b0e7
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/tmprepo74
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
5ee2bdc..3f0537b git-annex -> synced/git-annex
Updating 9868d8c..026b0e7
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/tmprepo73
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
5ee2bdc..3f0537b git-annex -> origin/git-annex
5ee2bdc..3f0537b synced/git-annex -> origin/synced/git-annex
From ../../.t/tmprepo74
9868d8c..026b0e7 master -> r2/master
OK (1.18s)
map: OK (0.33s)
uninit: Deleted branch git-annex (was 98e4266).
OK (11.20s)
uninit (in git-annex branch): Switched to branch 'git-annex'
OK (0.27s)
upgrade: OK (0.26s)
whereis: OK (0.46s)
hook remote: OK (0.73s)
directory remote: OK (0.69s)
rsync remote: OK (0.73s)
bup remote: OK (0.23s)
crypto: OK (0.67s)
preferred content: OK (1.39s)
add subdirs: 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 /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
3f0537b..5e9d032 git-annex -> synced/git-annex
026b0e7..f5decb4 master -> synced/master
OK (0.55s)
addurl: OK (0.39s)
Unit Tests v5 direct
add dup: Init Tests
init: On branch master
Initial commit
nothing to commit
OK (0.16s)
add: fatal: This operation must be run in a work tree
OK (0.23s)
All 2 tests passed (0.39s)
On branch master
nothing to commit, working directory clean
OK (0.36s)
add extras: On branch master
nothing to commit, working directory clean
OK (0.33s)
shared clone: On branch master
nothing to commit, working directory clean
OK (0.23s)
log: On branch master
nothing to commit, working directory clean
+ 2016-01-27 19:42:32 foo | d2ed898c-a6df-47fc-bd6a-d16863faad16 -- test repo [origin]
OK (0.25s)
import: On branch master
nothing to commit, working directory clean
OK (0.65s)
reinject: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.27s)
unannex (no copy): On branch master
nothing to commit, working directory clean
OK (0.30s)
unannex (with copy): On branch master
nothing to commit, working directory clean
OK (0.37s)
drop (no remote): On branch master
nothing to commit, working directory clean
OK (0.45s)
drop (with remote): On branch master
nothing to commit, working directory clean
OK (0.57s)
drop (untrusted remote): On branch master
nothing to commit, working directory clean
OK (0.46s)
get: On branch master
nothing to commit, working directory clean
OK (0.49s)
move: On branch master
nothing to commit, working directory clean
OK (0.75s)
copy: On branch master
nothing to commit, working directory clean
OK (0.71s)
lock: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
edit (no pre-commit): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
edit (pre-commit): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
partial commit: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
fix: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.29s)
direct: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.29s)
trust: On branch master
nothing to commit, working directory clean
OK (0.77s)
fsck (basics): On branch master
nothing to commit, working directory clean
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.
OK (0.76s)
fsck (bare): OK (0.17s)
fsck (local untrusted): On branch master
nothing to commit, working directory clean
Only these untrusted locations may have copies of foo
d2ed898c-a6df-47fc-bd6a-d16863faad16 -- test repo [origin]
e7cdf595-0025-402b-a356-af21e7799a86 -- .t/tmprepo23 [here]
Back it up to trusted locations with git-annex copy.
Only these untrusted locations may have copies of sha1foo
d2ed898c-a6df-47fc-bd6a-d16863faad16 -- test repo [origin]
Back it up to trusted locations with git-annex copy.
OK (0.56s)
fsck (remote untrusted): On branch master
nothing to commit, working directory clean
Only 1 of 2 trustworthy copies exist of foo
Back it up with git-annex copy.
The following untrusted locations may also have copies:
d2ed898c-a6df-47fc-bd6a-d16863faad16 -- 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:
d2ed898c-a6df-47fc-bd6a-d16863faad16 -- test repo [origin]
OK (0.53s)
fsck --from remote: On branch master
nothing to commit, working directory clean
OK (0.30s)
migrate: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
migrate (via gitattributes): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.28s)
unused: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.29s)
describe: On branch master
nothing to commit, working directory clean
OK (0.31s)
find: On branch master
nothing to commit, working directory clean
foo
foo
sha1foo
sha1foo
dir/subfile
OK (0.91s)
merge: On branch master
nothing to commit, working directory clean
OK (0.27s)
info: On branch master
nothing to commit, working directory clean
{"command":"info","repository mode":"direct","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"00000000-0000-0000-0000-000000000002","description":"bittorrent","here":false},{"uuid":"08a6cae6-fe10-47c7-ad55-eed41d0610e2","description":".t/tmprepo32","here":true},{"uuid":"d2ed898c-a6df-47fc-bd6a-d16863faad16","description":"test repo [origin]","here":false}],"untrusted repositories":[],"transfers in progress":[],"available local disk space":"25.01 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","annexed files in working tree":2,"size of annexed files in working tree":"45 bytes","bloom filter size":"32 mebibytes (0% full)","backend usage":{"SHA1":1,"SHA256E":1},"success":true}
OK (0.31s)
version: On branch master
nothing to commit, working directory clean
git-annex version: 6.20160126
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents XMPP ConcurrentOutput TorrentParser Feeds Quvi
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 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 5
supported repository versions: 5 6
upgrade supported from repository versions: 0 1 2 4 5
OK (0.25s)
sync: On branch master
nothing to commit, working directory clean
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
* [new branch] git-annex -> synced/git-annex
OK (0.45s)
union merge regression: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo36
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
From ../../.t/tmprepo35
* [new branch] annex/direct/master -> r1/annex/direct/master
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
To ../../.t/tmprepo36
* [new branch] git-annex -> synced/git-annex
* [new branch] annex/direct/master -> synced/master
To ../../.t/tmprepo35
* [new branch] git-annex -> synced/git-annex
* [new branch] annex/direct/master -> synced/master
From ../../.t/tmprepo37
* [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/tmprepo35
* [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/tmprepo37
* [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/tmprepo36
* [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/tmprepo37
3e7b78e..cd8105e git-annex -> r3/git-annex
From ../../.t/tmprepo36
3e7b78e..afe9d67 git-annex -> r2/git-annex
To ../../.t/tmprepo37
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo36
3e7b78e..7e13caa git-annex -> synced/git-annex
OK (2.44s)
conflict resolution: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo39
* [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/tmprepo39
7c48d32..f98c49f annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo38
* [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/tmprepo39
7c48d32..f98c49f annex/direct/master -> r2/annex/direct/master
conflictor.variant-75dc
conflictor.variant-a507
conflictor.variant-75dc
conflictor.variant-a507
OK (1.57s)
conflict resolution movein regression: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo41
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
To ../../.t/tmprepo41
* [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/tmprepo40
* [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/tmprepo40
207ebd2..0e35abc annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo41
9b7f59a..0e35abc annex/direct/master -> r2/annex/direct/master
ae15c9b..108482c git-annex -> r2/git-annex
207ebd2..0e35abc master -> r2/master
207ebd2..0e35abc synced/master -> r2/synced/master
OK (1.59s)
conflict resolution (mixed directory and file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo43
* [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/annex/direct/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
To ../../.t/tmprepo43
33c3854..638ac12 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo42
* [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 directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo44
* [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_annex_direct_master
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
To ../../.t/tmprepo44
dfb7232..32418ab annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
Adding conflictor/subfile
From ../../.t/tmprepo45
* [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 (3.07s)
conflict resolution symlink bit: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
238fe55..7c2d4d3 git-annex -> synced/git-annex
9b7f59a..09b8dbc annex/direct/master -> synced/master
conflictor
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
238fe55..7c2d4d3 git-annex -> origin/git-annex
9b7f59a..09b8dbc master -> origin/master
238fe55..7c2d4d3 synced/git-annex -> origin/synced/git-annex
9b7f59a..09b8dbc 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
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
7c2d4d3..636eb30 git-annex -> synced/git-annex
09b8dbc..eb0bc05 annex/direct/master -> synced/master
conflictor/subfile
From /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
238fe55..636eb30 git-annex -> origin/git-annex
9b7f59a..eb0bc05 master -> origin/master
238fe55..636eb30 synced/git-annex -> origin/synced/git-annex
9b7f59a..eb0bc05 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
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
636eb30..96d3488 git-annex -> synced/git-annex
eb0bc05..e058fa1 annex/direct/master -> synced/master
conflictor/subfile
OK (1.85s)
conflict resolution (uncommitted local file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo49
* [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 869c60b141477666327e788c2da4128ca997a1a0 ignored
To ../../.t/tmprepo49
869c60b..c49a46f annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo51
* [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 b072785e54ee69d01e424c3526ee972b314474fd ignored
To ../../.t/tmprepo51
b072785..cc2261a annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
OK (2.14s)
conflict resolution (removed file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo53
* [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 5a9c99e2c1615f6b4f447e051c73cfdbc44f0f02 ignored
To ../../.t/tmprepo53
5a9c99e..690f1d6 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
Already up-to-date!
From ../../.t/tmprepo54
* [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/tmprepo54
690f1d6..6285792 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/tmprepo53
5a9c99e..6285792 annex/direct/master -> r1/annex/direct/master
0eec9f8..34c2319 git-annex -> r1/git-annex
690f1d6..6285792 master -> r1/master
690f1d6..6285792 synced/master -> r1/synced/master
To ../../.t/tmprepo53
0eec9f8..34c2319 git-annex -> synced/git-annex
6285792..ccbd5b4 annex/direct/master -> synced/master
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo54
690f1d6..ccbd5b4 annex/direct/master -> r2/annex/direct/master
34c2319..f457fe8 git-annex -> r2/git-annex
6285792..ccbd5b4 master -> r2/master
6285792..ccbd5b4 synced/master -> r2/synced/master
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo55
* [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 cee360b0d9b4da3688ecdc33cb345a2d9268765e ignored
To ../../.t/tmprepo55
cee360b..5ca843e annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
To ../../.t/tmprepo55
e8ea18c..c36edc0 git-annex -> synced/git-annex
5ca843e..04ff521 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/tmprepo56
* [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/tmprepo56
04ff521..2faa5e0 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo55
cee360b..2faa5e0 annex/direct/master -> r1/annex/direct/master
c36edc0..2e79bde git-annex -> r1/git-annex
04ff521..2faa5e0 master -> r1/master
04ff521..2faa5e0 synced/master -> r1/synced/master
OK (3.69s)
conflict resolution (nonannexed file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
OK (2.32s)
conflict resolution (nonannexed symlink): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
OK (2.35s)
conflict resolution (mixed locked and unlocked file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo74
* [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
To ../../.t/tmprepo74
* [new branch] git-annex -> synced/git-annex
* [new branch] annex/direct/master -> synced/master
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
96d3488..607bce9 git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo73
* [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 /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
96d3488..607bce9 git-annex -> origin/git-annex
96d3488..607bce9 synced/git-annex -> origin/synced/git-annex
From ../../.t/tmprepo74
9b7f59a..e058fa1 annex/direct/master -> r2/annex/direct/master
OK (1.34s)
map: On branch master
nothing to commit, working directory clean
OK (0.40s)
uninit: On branch master
nothing to commit, working directory clean
Deleted branch git-annex (was 4757581).
OK (0.45s)
uninit (in git-annex branch): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK (0.34s)
upgrade: On branch master
nothing to commit, working directory clean
OK (0.38s)
whereis: On branch master
nothing to commit, working directory clean
OK (0.57s)
hook remote: On branch master
nothing to commit, working directory clean
OK (0.82s)
directory remote: On branch master
nothing to commit, working directory clean
OK (0.79s)
rsync remote: On branch master
nothing to commit, working directory clean
OK (0.82s)
bup remote: On branch master
nothing to commit, working directory clean
OK (0.30s)
crypto: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
OK (0.90s)
preferred content: On branch master
nothing to commit, working directory clean
OK (1.51s)
add subdirs: On branch master
nothing to commit, working directory clean
Automatic merge went well; stopped before committing as requested
To /private/tmp/git-annex20160127-91957-bij5sk/.t/repo
607bce9..9d955e0 git-annex -> synced/git-annex
e058fa1..cf11a6f annex/direct/master -> synced/master
OK (0.68s)
addurl: On branch master
nothing to commit, working directory clean
OK (0.46s)
All 269 tests passed (283.12s)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment