Skip to content

Instantly share code, notes, and snippets.

@fire

fire/gist:a3e108a113fc98f09dce

Created July 28, 2014 22:05
Show Gist options
  • Save fire/a3e108a113fc98f09dce to your computer and use it in GitHub Desktop.
Save fire/a3e108a113fc98f09dce to your computer and use it in GitHub Desktop.
Download ZIP
Git annex test on smartos
Raw
gistfile1.txt
Tests
QuickCheck
prop_idempotent_deencode_git: OK
+++ OK, passed 1000 tests.
prop_idempotent_deencode: OK
+++ OK, passed 1000 tests.
prop_idempotent_fileKey: OK
+++ OK, passed 1000 tests.
prop_idempotent_key_encode: OK
+++ OK, passed 1000 tests.
prop_idempotent_key_decode: OK
+++ OK, passed 1000 tests.
prop_idempotent_shellEscape: OK
+++ OK, passed 1000 tests.
prop_idempotent_shellEscape_multiword: OK
+++ OK, passed 1000 tests.
prop_logs_sane: OK
+++ OK, passed 1000 tests.
prop_idempotent_configEscape: OK
+++ OK, passed 1000 tests.
prop_parse_show_Config: OK
+++ OK, passed 1000 tests.
prop_parentDir_basics: OK
+++ OK, passed 1000 tests.
prop_relPathDirToFile_basics: OK
+++ 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
+++ OK, passed 1000 tests.
prop_segment_regressionTest: OK
+++ OK, passed 1000 tests.
prop_read_write_transferinfo: OK
+++ OK, passed 1000 tests.
prop_read_show_inodecache: OK
+++ OK, passed 1000 tests.
prop_parse_show_log: OK
+++ 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_schedule_roundtrips: OK
+++ OK, passed 1000 tests.
prop_past_sane: OK
+++ OK, passed 1000 tests.
prop_duration_roundtrips: OK
+++ OK, passed 1000 tests.
prop_metadata_sane: OK
+++ OK, passed 1000 tests.
prop_metadata_serialize: OK
+++ OK, passed 1000 tests.
prop_branchView_legal: OK
+++ OK, passed 1000 tests.
prop_view_roundtrips: OK
+++ OK, passed 1000 tests.
prop_viewedFile_rountrips: OK
I n i t T+e+s+t sO
K, piansiste:d 1000 tests.
Unit Tests (direct)
add sha1dup: On branch master
Initial commit
nothing to commit
OK
add: fatal: This operation must be run in a work tree
OK
All 2 tests passed
On branch master
nothing to commit, working directory clean
OK
add extras: On branch master
nothing to commit, working directory clean
OK
reinject: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
unannex (no copy): On branch master
nothing to commit, working directory clean
OK
unannex (with copy): On branch master
nothing to commit, working directory clean
git-annex: fd:16: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (no remote): On branch master
nothing to commit, working directory clean
git-annex: fd:10: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (with remote): On branch master
nothing to commit, working directory clean
git-annex: fd:10: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (untrusted remote): On branch master
nothing to commit, working directory clean
git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get failed
get: On branch master
nothing to commit, working directory clean
git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
move: On branch master
nothing to commit, working directory clean
git-annex: fd:10: hFlush: resource vanished (Broken pipe)
FAIL
move --from of file failed
copy: On branch master
nothing to commit, working directory clean
FAIL
checkcontent foo
expected: "annexed file content"
but got: "could not read file"
lock: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
edit (no pre-commit): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
edit (pre-commit): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
fix: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
trust: On branch master
nothing to commit, working directory clean
OK
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.
git-annex: fd:11: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
fsck (bare): OK
fsck (local untrusted): On branch master
nothing to commit, working directory clean
git-annex: fd:16: hFlush: resource vanished (Broken pipe)
FAIL
get failed
fsck (remote untrusted): On branch master
nothing to commit, working directory clean
git-annex: fd:14: hFlush: resource vanished (Broken pipe)
FAIL
get failed
migrate: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
migrate (via gitattributes): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
unused: On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
describe: On branch master
nothing to commit, working directory clean
OK
find: On branch master
nothing to commit, working directory clean
git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get failed
merge: On branch master
nothing to commit, working directory clean
OK
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":"26a566a1-8705-4296-bde9-4bcfcd623b1b","description":".t/tmprepo0","here":true},{"uuid":"847cc6c4-5674-409b-9962-c184b173c31a","description":"test repo [origin]","here":false}],"untrusted repositories":[],"available local disk space":"unknown","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":"16 mebibytes (0% full)","success":true}
OK
version: On branch master
nothing to commit, working directory clean
git-annex version: 5.20140717
build flags: Testsuite S3 Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web tahoe glacier ddar hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
OK
sync: On branch master
nothing to commit, working directory clean
To /home/annex/.t/repo
* [new branch] git-annex -> synced/git-annex
OK
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
git-annex: fd:10: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo1
* [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/tmprepo1
5a897ef..9b76566 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo0
* [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/tmprepo1
5a897ef..9b76566 annex/direct/master -> r2/annex/direct/master
664548d..9bdf596 git-annex -> r2/git-annex
git-annex: fd:12: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution movein regression: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
git-annex: fd:14: hFlush: resource vanished (Broken pipe)
git-annex: fd:14: hFlush: resource vanished (Broken pipe)
FAIL
get failed
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/tmprepo1
* [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/tmprepo1
783ca2d..90f2ee5 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo0
* [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
git-annex: fd:15: hFlush: resource vanished (Broken pipe)
FAIL
get failed in r1
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 /home/annex/.t/repo
65aaea3..50bc2fe git-annex -> synced/git-annex
029d663..8becbdc annex/direct/master -> synced/master
conflictor
From /home/annex/.t/repo
029d663..8becbdc master -> origin/master
65aaea3..50bc2fe synced/git-annex -> origin/synced/git-annex
029d663..8becbdc 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 /home/annex/.t/repo
50bc2fe..c27d7d1 git-annex -> synced/git-annex
8becbdc..833627e annex/direct/master -> synced/master
conflictor/subfile
From /home/annex/.t/repo
029d663..833627e master -> origin/master
65aaea3..c27d7d1 synced/git-annex -> origin/synced/git-annex
029d663..833627e 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 /home/annex/.t/repo
c27d7d1..e3afa60 git-annex -> synced/git-annex
833627e..62c18bf annex/direct/master -> synced/master
conflictor/subfile
OK
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/tmprepo0
* [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 358c8f47717de46fb676cfd8c47f38ecd39d8883 ignored
To ../../.t/tmprepo0
358c8f4..c581b01 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
git-annex: fd:25: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution (removed file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
From ../../.t/tmprepo0
* [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 216353d0ae5d7cea4116766f8afdc36eb1fa1a22 ignored
To ../../.t/tmprepo0
216353d..e4fdee0 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get conflictor failed
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
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
map: On branch master
nothing to commit, working directory clean
OK
uninit: On branch master
nothing to commit, working directory clean
git-annex: fd:12: hFlush: resource vanished (Broken pipe)
git-annex: fd:12: hFlush: resource vanished (Broken pipe)
FAIL
get failed
uninit (in git-annex branch): On branch master
nothing to commit, working directory clean
not supported in direct mode; skipping
OK
upgrade: On branch master
nothing to commit, working directory clean
OK
whereis: On branch master
nothing to commit, working directory clean
git-annex: fd:11: hFlush: resource vanished (Broken pipe)
FAIL
get failed
hook remote: On branch master
nothing to commit, working directory clean
git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
directory remote: On branch master
nothing to commit, working directory clean
git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
rsync remote: On branch master
nothing to commit, working directory clean
git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
bup remote: On branch master
nothing to commit, working directory clean
OK
crypto: On branch master
nothing to commit, working directory clean
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
preferred content: On branch master
nothing to commit, working directory clean
FAIL
get --auto of file failed for client
add subdirs: On branch master
nothing to commit, working directory clean
Automatic merge went well; stopped before committing as requested
To /home/annex/.t/repo
e3afa60..0a935f6 git-annex -> synced/git-annex
62c18bf..0b57ecd annex/direct/master -> synced/master
OK
IUnniitt TTeessttss
( i nidniirte:c t)
add sha1dup: OK
add: OK
All 2 tests passed
OK
add extras: OK
reinject: git-annex: fd:22: hFlush: resource vanished (Broken pipe)
FAIL
reinject failed
unannex (no copy): OK
unannex (with copy): git-annex: fd:18: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (no remote): git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (with remote): git-annex: fd:14: hFlush: resource vanished (Broken pipe)
FAIL
get failed
drop (untrusted remote): git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get failed
get: git-annex: fd:19: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
move: git-annex: fd:18: hFlush: resource vanished (Broken pipe)
FAIL
move --from of file failed
copy: FAIL
checkcontent foo
expected: "annexed file content"
but got: "could not read file"
lock: git-annex: fd:21: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
edit (no pre-commit): git-annex: fd:14: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
edit (pre-commit): git-annex: fd:21: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
fix: git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
trust: OK
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.
git-annex: fd:23: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
fsck (bare): OK
fsck (local untrusted): git-annex: fd:16: hFlush: resource vanished (Broken pipe)
FAIL
get failed
fsck (remote untrusted): git-annex: fd:22: hFlush: resource vanished (Broken pipe)
FAIL
get failed
migrate: git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
migrate (via gitattributes): git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
unused: git-annex: fd:16: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
describe: OK
find: git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get failed
merge: OK
info: {"command":"info","repository mode":"indirect","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"291d3240-f37f-4b72-a408-bc63e6a41c09","description":"test repo [origin]","here":false},{"uuid":"380c6474-0135-491a-aeec-529f48a7431b","description":".t/tmprepo0","here":true}],"untrusted repositories":[],"available local disk space":"unknown","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":"16 mebibytes (0% full)","success":true}
OK
version: git-annex version: 5.20140717
build flags: Testsuite S3 Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web tahoe glacier ddar hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
OK
sync: To /home/annex/.t/repo
* [new branch] git-annex -> synced/git-annex
* [new branch] master -> synced/master
OK
union merge regression: git-annex: fd:16: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution: From ../../.t/tmprepo1
* [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 ea59c40] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo1
8d8153c..ea59c40 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 8d8153c..ea59c40
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/tmprepo0
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo1
c46ae7f..c678858 git-annex -> r2/git-annex
8d8153c..ea59c40 master -> r2/master
git-annex: fd:20: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution movein regression: git-annex: fd:14: hFlush: resource vanished (Broken pipe)
git-annex: fd:14: hFlush: resource vanished (Broken pipe)
FAIL
get failed
conflict resolution (mixed directory and file): From ../../.t/tmprepo1
* [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 69682d8] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo1
d650dec..69682d8 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating d650dec..69682d8
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo0
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get failed in r1
conflict resolution symlink bit: To /home/annex/.t/repo
5721b8c..65d3705 git-annex -> synced/git-annex
179c397..7938730 master -> synced/master
conflictor
From /home/annex/.t/repo
5721b8c..65d3705 synced/git-annex -> origin/synced/git-annex
179c397..7938730 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 c4b2686] git-annex automatic merge conflict fix
To /home/annex/.t/repo
65d3705..220566d git-annex -> synced/git-annex
7938730..c4b2686 master -> synced/master
conflictor/subfile
From /home/annex/.t/repo
5721b8c..220566d synced/git-annex -> origin/synced/git-annex
179c397..c4b2686 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 6e7dd70] git-annex automatic merge conflict fix
To /home/annex/.t/repo
220566d..f325fa9 git-annex -> synced/git-annex
c4b2686..6e7dd70 master -> synced/master
conflictor/subfile
OK
conflict resolution (uncommitted local file): From ../../.t/tmprepo0
* [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 179c397..422a0a6
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 179c397..422a0a6
To ../../.t/tmprepo0
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo0'
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/tmprepo0
* [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 179c397..5236b86
error: The following untracked working tree files would be overwritten by merge:
conflictor
Please move or remove them before you can merge.
Aborting
Updating 179c397..5236b86
To ../../.t/tmprepo0
* [new branch] git-annex -> synced/git-annex
! [rejected] master -> synced/master (non-fast-forward)
error: failed to push some refs to '../../.t/tmprepo0'
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
conflict resolution (removed file): From ../../.t/tmprepo0
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
Updating 179c397..4a9a10b
Fast-forward
conflictor | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor
Already up-to-date.
To ../../.t/tmprepo0
* [new branch] git-annex -> synced/git-annex
git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get conflictor failed
conflict resolution (nonannexed file): From ../../.t/tmprepo1
* [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 f6f7a6e] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo1
1c35a72..f6f7a6e master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 1c35a72..f6f7a6e
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo0
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo0
* [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 fab9e36] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo0
80ec5da..fab9e36 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 80ec5da..fab9e36
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/tmprepo1
* [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
/home/annex/.t/tmprepo0/.git/annex/misctmp/tmp18082: rename: does not exist (No such file or directory)
leaving this file as-is; correct this problem and run git annex fsck on it
From ../../.t/tmprepo1
* [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/tmprepo1
fe86810..2ace557 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/tmprepo0
* [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/tmprepo0
* [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/tmprepo0
3e4a011..9c83093 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory clean
/home/annex/.t/tmprepo0/.git/annex/misctmp/tmp18082: rename: does not exist (No such file or directory)
leaving this file as-is; correct this problem and run git annex fsck on it
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo1
* [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
conflict resolution (nonannexed symlink): From ../../.t/tmprepo1
* [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 827ef02] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo1
5c228d1..827ef02 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating 5c228d1..827ef02
Fast-forward
conflictor.variant-cc12 | 1 +
1 file changed, 1 insertion(+)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo0
* [new branch] git-annex -> r1/git-annex
* [new branch] master -> r1/master
* [new branch] synced/master -> r1/synced/master
From ../../.t/tmprepo0
* [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 c756c98] git-annex automatic merge conflict fix
Already up-to-date.
To ../../.t/tmprepo0
f62ec70..c756c98 master -> synced/master
* [new branch] git-annex -> synced/git-annex
Updating f62ec70..c756c98
Fast-forward
conflictor | 2 +-
conflictor.variant-cc12 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 120000 conflictor.variant-cc12
From ../../.t/tmprepo1
* [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
/home/annex/.t/tmprepo0/.git/annex/misctmp/tmp18082: rename: does not exist (No such file or directory)
leaving this file as-is; correct this problem and run git annex fsck on it
From ../../.t/tmprepo1
* [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/tmprepo1
0b182bb..821d8fe 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/tmprepo0
* [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/tmprepo0
* [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/tmprepo0
fd660e1..cdffa45 annex/direct/master -> synced/master
* [new branch] git-annex -> synced/git-annex
On branch master
nothing to commit, working directory clean
/home/annex/.t/tmprepo0/.git/annex/misctmp/tmp18082: rename: does not exist (No such file or directory)
leaving this file as-is; correct this problem and run git annex fsck on it
Automatic merge went well; stopped before committing as requested
From ../../.t/tmprepo1
* [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
map: OK
uninit: git-annex: fd:12: hFlush: resource vanished (Broken pipe)
git-annex: fd:12: hFlush: resource vanished (Broken pipe)
FAIL
get failed
uninit (in git-annex branch): Switched to branch 'git-annex'
OK
upgrade: OK
whereis: git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get failed
hook remote: git-annex: fd:9: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
directory remote: git-annex: fd:11: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
rsync remote: git-annex: fd:13: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
bup remote: OK
crypto: gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
gpg: WARNING: using insecure memory!
gpg: please see http://www.gnupg.org/faq.html for more information
git-annex: fd:17: hFlush: resource vanished (Broken pipe)
FAIL
get of file failed
preferred content: FAIL
get --auto of file failed for client
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 /home/annex/.t/repo
f325fa9..579081b git-annex -> synced/git-annex
6e7dd70..3ee8cfc master -> synced/master
OK
55 out of 134 tests failed
(This could be due to a bug in git-annex, or an incompatability
with utilities, such as git, installed on this system.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment