diff options
| author |  lykos <lykos@web> | 2017-07-30 16:45:34 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2017-07-30 16:45:34 +0000 |
| commit | ab9d58d3a8e53e7e773e8c02c2c4395df18da215 (patch) | |
| tree | 324853b7a69c96bdce94df7fb55f93064c6b270f /doc | |
| parent | c6858789e33f785edb1c7a7929b534e445849e07 (diff) | |
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/Tests_fail_on_Windows_10.mdwn | 2004 |
1 files changed, 2004 insertions, 0 deletions
diff --git a/doc/bugs/Tests_fail_on_Windows_10.mdwn b/doc/bugs/Tests_fail_on_Windows_10.mdwn new file mode 100644 index 000000000..110e8cf06 --- /dev/null +++ b/doc/bugs/Tests_fail_on_Windows_10.mdwn @@ -0,0 +1,2004 @@ +### Please describe the problem. + +Just tried to install git-annex on a friend's Windows machine share a repo, but a lot of the tests failed. I have no idea how to debug things on Windows. Maybe someone has an idea. AFIAK Windows has only crippled file systems, I tried with NTFS and ReFS. + +It says "Permission denied. File is being used by another process". Maybe some kind of indexing? git annex assistant was turned off and it was the only test running. + +### What steps will reproduce the problem? + +Install git, intsall git-annex, run "git annex test" + +### What version of git-annex are you using? On what operating system? + +Windows 10. git 32 bit + +git-annex version: 6.20170611-gb493ac8 +build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV ConcurrentOutput TorrentParser Feeds Quvi +dependency versions: aws-0.14.0 bloomfilter-2.0.1.0 cryptonite-0.7 DAV-1.3.1 feed-0.3.11.1 ghc-7.10.2 http-client-0.4.31.1 persistent-sqlite-2.2 torrent-10000.0.0 uuid-1.3.12 yesod +-1.4.3 +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 SKEIN +512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL +remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external + +### Please provide any additional information below. + +[[!format sh """ + +PS G:\test2> git annex test +Tests + QuickCheck + prop_isomorphic_deencode_git: OK (0.11s) + +++ OK, passed 1000 tests. + prop_isomorphic_deencode: OK (0.11s) + +++ OK, passed 1000 tests. + prop_isomorphic_fileKey: OK (0.04s) + +++ OK, passed 1000 tests. + prop_isomorphic_key_encode: OK (0.06s) + +++ OK, passed 1000 tests. + prop_isomorphic_key_decode: OK (0.04s) + +++ OK, passed 1000 tests. + prop_isomorphic_shellEscape: OK (0.05s) + +++ OK, passed 1000 tests. + prop_isomorphic_shellEscape_multiword: OK (1.61s) + +++ OK, passed 1000 tests. + prop_isomorphic_configEscape: OK (0.04s) + +++ OK, passed 1000 tests. + prop_parse_show_Config: OK (0.11s) + +++ OK, passed 1000 tests. + prop_upFrom_basics: OK (0.04s) + +++ OK, passed 1000 tests. + prop_relPathDirToFile_basics: OK (0.09s) + +++ 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.02s) + +++ OK, passed 1000 tests. + prop_parse_show_log: OK (2.05s) + +++ 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 (6.90s) + +++ OK, passed 1000 tests. + prop_metadata_serialize: OK (6.37s) + +++ OK, passed 1000 tests. + prop_branchView_legal: OK (10.22s) + +++ OK, passed 1000 tests. + prop_viewPath_roundtrips: OK (0.11s) + +++ OK, passed 1000 tests. + prop_view_roundtrips: OK (1.28s) + +++ OK, passed 1000 tests. + prop_viewedFile_rountrips: OK (0.04s) + +++ OK, passed 1000 tests. + prop_b64_roundtrips: OK + +++ OK, passed 1000 tests. + prop_standardGroups_parse: OKInit Tests + init: + +++ OK, passed 1000 tests. + Unit Tests v6 unlocked + add dup: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Entering an adjusted branch where files are unlocked as this filesystem does not support locked files. +Switched to branch 'adjusted/master(unlocked)' +OK (1.32s) + add: OK (1.12s) + +All 2 tests passed (2.44s) + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.33s) + add extras: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.46s) + shared clone: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (0.94s) + log: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. ++ Sun, 30 Jul 2017 02:07:24 Mitteleurop├Áische Sommerzeit foo | ccfb8066-6f33-425e-9459-7fda7a8b9117 -- test repo [origi +n] +OK (0.94s) + import: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +git-annex: MoveFileEx "C:\\Users\\Minnie\\AppData\\Local\\Temp\\importtest.0\\import1\\f" "import1\\f": permission denie +d (Der Prozess kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess verwendet wird.) +FAIL (4.98s) + import failed + reinject: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +git-annex: MoveFileEx "tmpfile" ".git\\annex\\objects\\ecb\\0b5\\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa\\SHA +1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa": permission denied (Der Prozess kann nicht auf die Datei zugreifen, da +sie von einem anderen Prozess verwendet wird.) +FAIL (3.55s) + reinject failed + unannex (no copy): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.20s) + unannex (with copy): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.51s) + drop (no remote): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.81s) + drop (with remote): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +numcopies 2 ok +(recording state in git...) +numcopies 1 ok +(recording state in git...) +OK (2.31s) + drop (untrusted remote): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.73s) + get: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.86s) + get (ssh remote): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +Der Befehl "git-annex-shell" ist entweder falsch geschrieben oder +konnte nicht gefunden werden. +rsync: safe_read failed to read 4 bytes [Receiver]: Connection reset by peer (104) +rsync error: error in rsync protocol data stream (code 12) at io.c(276) [Receiver=3.1.1] +FAIL (1.21s) + get of file failed + move: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (3.05s) + move (ssh remote): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +Der Befehl "git-annex-shell" ist entweder falsch geschrieben oder +konnte nicht gefunden werden. +rsync: safe_read failed to read 4 bytes [Receiver]: Connection reset by peer (104) +rsync error: error in rsync protocol data stream (code 12) at io.c(276) [Receiver=3.1.1] +FAIL (1.19s) + move --from of file failed + copy: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.56s) + lock: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (3.44s) + lock (v6 --force): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +FAIL + Exception: removeDirectoryRecursive: does not exist (Das System kann die angegebene Datei nicht finden.) + edit (no pre-commit): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.22s) + edit (pre-commit): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.07s) + partial commit: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.03s) + fix: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.11s) + direct: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.57s) + trust: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.59s) + fsck (basics): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +numcopies 2 ok +(recording state in git...) + Only 1 of 2 trustworthy copies exist of foo + Back it up with git-annex copy. + Only 1 of 2 trustworthy copies exist of sha1foo + Back it up with git-annex copy. +numcopies 1 ok +(recording state in git...) +OK (3.09s) + fsck (bare): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.45s) + fsck (local untrusted): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Only these untrusted locations may have copies of foo + 3a088e2e-d913-45c7-a6f4-187c6c23d52d -- .t\tmprepo26 [here] + ccfb8066-6f33-425e-9459-7fda7a8b9117 -- test repo [origin] + Back it up to trusted locations with git-annex copy. + Only these untrusted locations may have copies of sha1foo + ccfb8066-6f33-425e-9459-7fda7a8b9117 -- test repo [origin] + Back it up to trusted locations with git-annex copy. +OK (2.05s) + fsck (remote untrusted): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +numcopies 2 ok +(recording state in git...) + Only 1 of 2 trustworthy copies exist of foo + Back it up with git-annex copy. + The following untrusted locations may also have copies: + ccfb8066-6f33-425e-9459-7fda7a8b9117 -- 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: + ccfb8066-6f33-425e-9459-7fda7a8b9117 -- test repo [origin] +OK (2.21s) + fsck --from remote: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.38s) + migrate: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + MoveFileEx ".git\\annex\\misctmp\\t.0\\t" ".git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6 +d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77": perm +ission denied (Zugriff verweigert) +FAIL (2.41s) + migrate annexedfile failed + migrate (via gitattributes): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + MoveFileEx ".git\\annex\\misctmp\\t.0\\t" ".git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6 +d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77": perm +ission denied (Zugriff verweigert) +FAIL (2.56s) + migrate annexedfile failed + unused: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + bloomfilter capacity too large to represent; falling back to sane value +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) y +Unlink of file 'foo' failed. Should I try again? (y/n) n +fatal: git rm: 'foo': Invalid argument +FAIL (129.88s) + git rm failed + describe: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.83s) + find: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +foo +foo +sha1foo +sha1foo +dir/subfile +OK (2.89s) + merge: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (0.96s) + info: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + bloomfilter capacity too large to represent; falling back to sane value + bloomfilter capacity too large to represent; falling back to sane value +{"transfers in progress":[],"local annex keys":0,"available local disk space":"840.12 gigabytes (+1 megabyte reserved)", +"annexed files in working tree":2,"file":null,"trusted repositories":[],"size of annexed files in working tree":"45 byte +s","local annex size":"0 bytes","command":"info","untrusted repositories":[],"semitrusted repositories":[{"description": +"web","here":false,"uuid":"00000000-0000-0000-0000-000000000001"},{"description":"bittorrent","here":false,"uuid":"00000 +000-0000-0000-0000-000000000002"},{"description":".t\\tmprepo35","here":true,"uuid":"1493e4c5-cbc7-4571-9c87-696e2a91861 +b"},{"description":"test repo [origin]","here":false,"uuid":"ccfb8066-6f33-425e-9459-7fda7a8b9117"}],"success":true,"blo +om filter size":"32 mebibytes (0% full)","backend usage":{"SHA1":1,"SHA256E":1},"repository mode":"indirect"} +OK (1.13s) + version: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +git-annex version: 6.20170611-gb493ac8 +build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV ConcurrentOutput TorrentParse +r Feeds Quvi +dependency versions: aws-0.14.0 bloomfilter-2.0.1.0 cryptonite-0.7 DAV-1.3.1 feed-0.3.11.1 ghc-7.10.2 http-client-0.4.31 +.1 persistent-sqlite-2.2 torrent-10000.0.0 uuid-1.3.12 yesod-1.4.3 +key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SH +A3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL +remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external +local repository version: 6 +supported repository versions: 3 5 6 +upgrade supported from repository versions: 2 3 4 5 +operating system: mingw32 i386 +OK (0.97s) + sync: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +On branch adjusted/master(unlocked) +Your branch is up-to-date with 'origin/adjusted/master(unlocked)'. +nothing to commit, working tree clean +Counting objects: 10, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (9/9), done. +Writing objects: 100% (10/10), 1.11 KiB | 0 bytes/s, done. +Total 10 (delta 2), reused 0 (delta 0) +To G:/test2/.t\repo + * [new branch] git-annex -> synced/git-annex + * [new branch] master -> synced/master +foo +wanted . ok +(recording state in git...) +On branch adjusted/master(unlocked) +Your branch and 'origin/adjusted/master(unlocked)' have diverged, +and have 2 and 2 different commits each, respectively. + (use "git pull" to merge the remote branch into yours) +nothing to commit, working tree clean +Counting objects: 8, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (7/7), done. +Writing objects: 100% (8/8), 764 bytes | 0 bytes/s, done. +Total 8 (delta 2), reused 0 (delta 0) +To G:/test2/.t\repo + d94bd7a..4751eeb git-annex -> synced/git-annex +foo +On branch adjusted/master(unlocked) +Your branch and 'origin/adjusted/master(unlocked)' have diverged, +and have 2 and 2 different commits each, respectively. + (use "git pull" to merge the remote branch into yours) +nothing to commit, working tree clean +Counting objects: 5, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (4/4), done. +Writing objects: 100% (5/5), 522 bytes | 0 bytes/s, done. +Total 5 (delta 1), reused 0 (delta 0) +To G:/test2/.t\repo + 4751eeb..68a9352 git-annex -> synced/git-annex +OK (4.66s) + union merge regression: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 11, done. +remote: Compressing objects: 100% (9/9), done. +remote: Total 11 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (11/11), done. +From ../../.t\tmprepo39 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master +remote: Counting objects: 9, done. +remote: Compressing objects: 100% (8/8), done. +remote: Total 9 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (9/9), done. +From ../../.t\tmprepo38 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master +Counting objects: 30, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (26/26), done. +Writing objects: 100% (30/30), 2.87 KiB | 0 bytes/s, done. +Total 30 (delta 12), reused 0 (delta 0) +To ../../.t\tmprepo39 + * [new branch] git-annex -> synced/git-annex + * [new branch] master -> synced/master +To ../../.t\tmprepo39 + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to '../../.t\tmprepo39' +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. +Counting objects: 30, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (26/26), done. +Writing objects: 100% (30/30), 2.83 KiB | 0 bytes/s, done. +Total 30 (delta 13), reused 0 (delta 0) +To ../../.t\tmprepo38 + * [new branch] git-annex -> synced/git-annex + * [new branch] master -> synced/master +To ../../.t\tmprepo38 + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to '../../.t\tmprepo38' +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. +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD cd6b062] git-annex automatic merge conflict fix +Updating 75480f7..672d8f6 +error: Your local changes to the following files would be overwritten by merge: + foo +Please commit your changes or stash them before you merge. +Aborting +remote: Counting objects: 4, done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 4 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (4/4), done. +From ../../.t\tmprepo40 + * [new branch] adjusted/master(unlocked) -> r3/adjusted/master(unlocked) + * [new branch] git-annex -> r3/git-annex + * [new branch] master -> r3/master + * [new branch] synced/master -> r3/synced/master +From ../../.t\tmprepo38 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [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 +Merge made by the 'recursive' strategy. + bar.c | 1 - + foo | 1 - + sha1foo | 1 - + 3 files changed, 3 deletions(-) + delete mode 100644 bar.c + delete mode 120000 foo + delete mode 120000 sha1foo +Updating 75480f7..2773470 +error: Your local changes to the following files would be overwritten by merge: + foo +Please commit your changes or stash them before you merge. +Aborting +Counting objects: 9, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (9/9), done. +Writing objects: 100% (9/9), 954 bytes | 0 bytes/s, done. +Total 9 (delta 5), reused 0 (delta 0) +To ../../.t\tmprepo40 + 9588f09..b8df995 master -> synced/master + * [new branch] git-annex -> synced/git-annex +Counting objects: 9, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (9/9), done. +Writing objects: 100% (9/9), 954 bytes | 0 bytes/s, done. +Total 9 (delta 5), reused 0 (delta 0) +To ../../.t\tmprepo38 + 9588f09..b8df995 master -> synced/master +FAIL (8.41s) + sync failed in .t\tmprepo39 + adjusted branch merge regression: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +Already on 'adjusted/master(unlocked)' +M foo +[adjusted/master(unlocked) 22ff3ea] git-annex in .t\tmprepo41 + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor +remote: Counting objects: 11, done. +remote: Compressing objects: 100% (10/10), done. +remote: Total 11 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (11/11), done. +From ../../.t\tmprepo42 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master +Counting objects: 18, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (16/16), done. +Writing objects: 100% (18/18), 1.72 KiB | 0 bytes/s, done. +Total 18 (delta 7), reused 0 (delta 0) +To ../../.t\tmprepo42 + * [new branch] git-annex -> synced/git-annex + * [new branch] master -> synced/master +Already on 'adjusted/master(unlocked)' +D conflictor +M foo +[adjusted/master(unlocked) b0c16b3] git-annex in .t\tmprepo42 + 2 files changed, 2 insertions(+), 2 deletions(-) +remote: Counting objects: 5, done. +remote: Compressing objects: 100% (5/5), done. +remote: Total 5 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (5/5), done. +From ../../.t\tmprepo41 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Counting objects: 9, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (8/8), done. +Writing objects: 100% (9/9), 806 bytes | 0 bytes/s, done. +Total 9 (delta 4), reused 0 (delta 0) +To ../../.t\tmprepo41 + 6f2f330..2f4c792 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 6f2f330..2f4c792 +Fast-forward + conflictor | 2 +- + foo | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Updating a6b8bec..222127f +Fast-forward + conflictor | 2 +- + foo | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +remote: Counting objects: 5, done. +remote: Compressing objects: 100% (5/5), done. +remote: Total 5 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (5/5), done. +From ../../.t\tmprepo42 + + 75480f7...62cd69f adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) + 14acc87..16ac4ee git-annex -> r2/git-annex + 6f2f330..2f4c792 master -> r2/master + 6f2f330..2f4c792 synced/master -> r2/synced/master +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 5, done. +remote: Compressing objects: 100% (5/5), done. +remote: Total 5 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (5/5), done. +From ../../.t\tmprepo41 + + a6b8bec...29bc72f adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) +OK (7.19s) + adjusted branch subtree regression: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +Already on 'adjusted/master(unlocked)' +M foo +[adjusted/master(unlocked) dd3d179] git-annex in .t\tmprepo43 + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 a/b/c/d +[adjusted/master(unlocked) 543a653] git-annex in .t\tmprepo43 + 1 file changed, 1 insertion(+) + create mode 100644 a/b/x/y +Switched to branch 'master' +OK (2.58s) + conflict resolution: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 5cb38e6] git-annex in .t\tmprepo44 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) dbe9298] git-annex in .t\tmprepo45 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 5), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo45 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 106cd9d] git-annex automatic merge conflict fix +Updating 085b7b5..5a26f64 +Fast-forward + conflictor.variant-75dc | 1 + + conflictor => conflictor.variant-a507 | 2 +- + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-75dc + rename conflictor => conflictor.variant-a507 (98%) +Counting objects: 23, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (22/22), done. +Writing objects: 100% (23/23), 2.27 KiB | 0 bytes/s, done. +Total 23 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo45 + b9ebb44..106cd9d master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating b9ebb44..106cd9d +Fast-forward + conflictor | 1 - + conflictor.variant-75dc | 1 + + conflictor.variant-a507 | 1 + + foo | 2 +- + sha1foo | 2 +- + 5 files changed, 4 insertions(+), 3 deletions(-) + delete mode 120000 conflictor + create mode 120000 conflictor.variant-75dc + create mode 120000 conflictor.variant-a507 +Updating 834afb8..a855bbb +Fast-forward + conflictor => conflictor.variant-75dc | 2 +- + conflictor.variant-a507 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename conflictor => conflictor.variant-75dc (98%) + create mode 100644 conflictor.variant-a507 +From ../../.t\tmprepo44 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +[adjusted/master(unlocked) a544d12] git-annex in .t\tmprepo44 + 1 file changed, 1 insertion(+), 1 deletion(-) +From ../../.t\tmprepo45 + + 834afb8...ba3658e adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) +Counting objects: 1, done. +Writing objects: 100% (1/1), 191 bytes | 0 bytes/s, done. +Total 1 (delta 0), reused 0 (delta 0) +To ../../.t\tmprepo45 + 106cd9d..55808e6 master -> synced/master +conflictor.variant-a507 +conflictor.variant-75dc +conflictor.variant-a507 +conflictor.variant-75dc +OK (8.56s) + conflict resolution (adjusted branch): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) c828dc1] git-annex in .t\tmprepo46 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) f2a9fab] git-annex in .t\tmprepo47 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +Already on 'adjusted/master(unlocked)' +M conflictor +M foo +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 5), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo47 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 5c75014] git-annex automatic merge conflict fix +Updating 21164f0..40932a6 +Fast-forward + conflictor.variant-75dc | 1 + + conflictor => conflictor.variant-a507 | 2 +- + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-75dc + rename conflictor => conflictor.variant-a507 (98%) +Counting objects: 23, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (22/22), done. +Writing objects: 100% (23/23), 2.31 KiB | 0 bytes/s, done. +Total 23 (delta 9), reused 0 (delta 0) +To ../../.t\tmprepo47 + f48a2ad..5c75014 master -> synced/master + * [new branch] git-annex -> synced/git-annex +[adjusted/master(unlocked) 5582940] git-annex in .t\tmprepo47 + 2 files changed, 2 insertions(+), 2 deletions(-) +Removing conflictor +Merge made by the 'recursive' strategy. + conflictor | 1 - + conflictor.variant-75dc | 1 + + conflictor.variant-a507 | 1 + + foo | 2 +- + sha1foo | 2 +- + 5 files changed, 4 insertions(+), 3 deletions(-) + delete mode 120000 conflictor + create mode 120000 conflictor.variant-75dc + create mode 120000 conflictor.variant-a507 +Updating 5582940..95b64c3 +Fast-forward + conflictor => conflictor.variant-75dc | 2 +- + conflictor.variant-a507 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename conflictor => conflictor.variant-75dc (98%) + create mode 100644 conflictor.variant-a507 +remote: Counting objects: 6, done. +remote: Compressing objects: 100% (6/6), done. +remote: Total 6 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (6/6), done. +From ../../.t\tmprepo46 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Counting objects: 2, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (2/2), done. +Writing objects: 100% (2/2), 407 bytes | 0 bytes/s, done. +Total 2 (delta 0), reused 0 (delta 0) +To ../../.t\tmprepo46 + 5c75014..0be7ee2 master -> synced/master + * [new branch] git-annex -> synced/git-annex +[adjusted/master(unlocked) e579d2b] git-annex in .t\tmprepo46 + 1 file changed, 1 insertion(+), 1 deletion(-) +Already up-to-date! +Merge made by the 'recursive' strategy. +Updating e579d2b..5dc5ec6 +Fast-forward + conflictor.variant-a507 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +remote: Counting objects: 6, done. +remote: Compressing objects: 100% (6/6), done. +remote: Total 6 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (6/6), done. +From ../../.t\tmprepo47 + + 844c7ad...1d42500 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) + 5c75014..0be7ee2 master -> r2/master + 5c75014..0be7ee2 synced/master -> r2/synced/master +Counting objects: 2, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (2/2), done. +Writing objects: 100% (2/2), 334 bytes | 0 bytes/s, done. +Total 2 (delta 1), reused 0 (delta 0) +To ../../.t\tmprepo47 + 0be7ee2..b481b8e master -> synced/master +conflictor.variant-a507 +conflictor.variant-75dc +conflictor.variant-a507 +conflictor.variant-75dc +OK (9.46s) + conflict resolution movein regression: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 98268ad] git-annex in .t\tmprepo48 + 2 files changed, 2 insertions(+), 2 deletions(-) +remote: Counting objects: 14, done. +remote: Compressing objects: 100% (11/11), done. +remote: Total 14 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (14/14), done. +From ../../.t\tmprepo49 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master +Counting objects: 33, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (27/27), done. +Writing objects: 100% (33/33), 3.04 KiB | 0 bytes/s, done. +Total 33 (delta 9), reused 0 (delta 0) +To ../../.t\tmprepo49 + * [new branch] git-annex -> synced/git-annex + * [new branch] master -> synced/master +To ../../.t\tmprepo49 + ! [rejected] master -> 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. +[adjusted/master(unlocked) 4839b05] git-annex in .t\tmprepo49 + 2 files changed, 2 insertions(+), 2 deletions(-) +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +foo: needs merge +[detached HEAD 4d9c158] git-annex automatic merge conflict fix +Updating 4839b05..941b7f7 +Fast-forward + foo.variant-0b0e | 1 + + foo => foo.variant-bc25 | 2 +- + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 foo.variant-0b0e + rename foo => foo.variant-bc25 (98%) +remote: Counting objects: 4, done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 4 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (4/4), done. +From ../../.t\tmprepo48 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Counting objects: 10, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (10/10), done. +Writing objects: 100% (10/10), 1.18 KiB | 0 bytes/s, done. +Total 10 (delta 2), reused 0 (delta 0) +To ../../.t\tmprepo48 + dcae980..4d9c158 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating dcae980..4d9c158 +Fast-forward + foo | 1 - + foo.variant-0b0e | 1 + + foo.variant-bc25 | 1 + + sha1foo | 2 +- + 4 files changed, 3 insertions(+), 2 deletions(-) + delete mode 120000 foo + create mode 120000 foo.variant-0b0e + create mode 120000 foo.variant-bc25 +Updating 93aeb67..c5dd322 +Fast-forward + foo => foo.variant-0b0e | 2 +- + foo.variant-bc25 | 1 + + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename foo => foo.variant-0b0e (98%) + create mode 100644 foo.variant-bc25 +remote: Counting objects: 5, done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 5 (delta 1), reused 0 (delta 0) +Unpacking objects: 100% (5/5), done. +From ../../.t\tmprepo49 + + 75480f7...834d96c adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) + 2411485..288a846 git-annex -> r2/git-annex + + 685e9b5...4d9c158 master -> r2/master (forced update) + dcae980..4d9c158 synced/master -> r2/synced/master +OK (8.20s) + conflict resolution (mixed directory and file): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 77f9c58] git-annex in .t\tmprepo50 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) e1fa8b8] git-annex in .t\tmprepo51 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor/subfile +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 25, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 25 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (25/25), done. +From ../../.t\tmprepo51 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Adding conflictor/subfile +CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/r2/master. Adding conflictor as con +flictor~HEAD +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 724aad5] git-annex automatic merge conflict fix +Updating 7ceb7ad..1c51b66 +Fast-forward + conflictor => conflictor.variant-cc12 | 2 +- + conflictor/subfile | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename conflictor => conflictor.variant-cc12 (98%) + create mode 100644 conflictor/subfile +Counting objects: 22, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (21/21), done. +Writing objects: 100% (22/22), 2.15 KiB | 0 bytes/s, done. +Total 22 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo51 + f4b3387..724aad5 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating f4b3387..724aad5 +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 120000 conflictor.variant-cc12 +Updating 98b13e3..6ab96da +Fast-forward + conflictor.variant-cc12 | 1 + + conflictor/subfile | 2 +- + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +From ../../.t\tmprepo50 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +conflictor/subfile +conflictor.variant-cc12 +conflictor/subfile +conflictor.variant-cc12 + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) de2bac8] git-annex in .t\tmprepo52 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) eb3a2f9] git-annex in .t\tmprepo53 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor/subfile +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo52 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Adding conflictor/subfile +CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remot +es_r1_master +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 80b8489] git-annex automatic merge conflict fix +Updating f4714af..8c0e1af +Fast-forward + conflictor.variant-cc12 | 1 + + conflictor/subfile | 2 +- + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +Counting objects: 24, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (22/22), done. +Writing objects: 100% (24/24), 2.34 KiB | 0 bytes/s, done. +Total 24 (delta 9), reused 0 (delta 0) +To ../../.t\tmprepo52 + c785d3b..80b8489 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating c785d3b..80b8489 +Fast-forward + conflictor | 1 - + conflictor.variant-cc12 | 1 + + conflictor/subfile | 1 + + foo | 2 +- + sha1foo | 2 +- + 5 files changed, 4 insertions(+), 3 deletions(-) + delete mode 120000 conflictor + create mode 120000 conflictor.variant-cc12 + create mode 120000 conflictor/subfile +Updating f9dc04b..83e640a +Fast-forward + conflictor => conflictor.variant-cc12 | 2 +- + conflictor/subfile | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + rename conflictor => conflictor.variant-cc12 (98%) + create mode 100644 conflictor/subfile +From ../../.t\tmprepo53 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +conflictor/subfile +conflictor.variant-cc12 +conflictor/subfile +conflictor.variant-cc12 +OK (15.63s) + conflict resolution symlink bit: OK + conflict resolution (uncommitted local file): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 4cfaea2] git-annex in .t\tmprepo54 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +Untracked files: + conflictor + +nothing added to commit but untracked files present +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 5), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo54 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD 2a880d5] git-annex automatic merge conflict fix +Updating 75480f7..c84a79d +error: The following untracked working tree files would be overwritten by merge: + conflictor +Please move or remove them before you merge. +Aborting +Already up-to-date. +Updating 75480f7..4acfac6 +error: The following untracked working tree files would be overwritten by merge: + conflictor +Please move or remove them before you merge. +Aborting +Counting objects: 18, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (18/18), done. +Writing objects: 100% (18/18), 1.77 KiB | 0 bytes/s, done. +Total 18 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo54 + bda2c4e..5fd3f84 master -> synced/master + * [new branch] git-annex -> synced/git-annex + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) a7ba016] git-annex in .t\tmprepo56 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor/file +On branch adjusted/master(unlocked) +Untracked files: + conflictor + +nothing added to commit but untracked files present +remote: Counting objects: 25, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 25 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (25/25), done. +From ../../.t\tmprepo56 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD f13554c] git-annex automatic merge conflict fix +Updating 75480f7..01da6d6 +error: The following untracked working tree files would be overwritten by merge: + conflictor +Please move or remove them before you merge. +Aborting +Already up-to-date. +Updating 75480f7..2b83f70 +error: The following untracked working tree files would be overwritten by merge: + conflictor +Please move or remove them before you merge. +Aborting +Counting objects: 18, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (18/18), done. +Writing objects: 100% (18/18), 1.76 KiB | 0 bytes/s, done. +Total 18 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo56 + 363622c..0103a78 master -> synced/master + * [new branch] git-annex -> synced/git-annex +OK (10.59s) + conflict resolution (removed file): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) e7f1054] git-annex in .t\tmprepo58 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo58 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD 55cc242] git-annex automatic merge conflict fix +Updating 75480f7..bfe5776 +Fast-forward + conflictor | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor +Counting objects: 14, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (14/14), done. +Writing objects: 100% (14/14), 1.42 KiB | 0 bytes/s, done. +Total 14 (delta 8), reused 0 (delta 0) +To ../../.t\tmprepo58 + 34511ad..55cc242 master -> synced/master + * [new branch] git-annex -> synced/git-annex +[adjusted/master(unlocked) 937a71e] git-annex in .t\tmprepo58 + 1 file changed, 1 deletion(-) + delete mode 100644 conflictor +Merge made by the 'recursive' strategy. + foo | 2 +- + sha1foo | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Updating 937a71e..e992316 +Fast-forward + foo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +remote: Counting objects: 10, done. +remote: Compressing objects: 100% (9/9), done. +remote: Total 10 (delta 2), reused 0 (delta 0) +Unpacking objects: 100% (10/10), done. +From ../../.t\tmprepo59 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Counting objects: 4, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (4/4), done. +Writing objects: 100% (4/4), 482 bytes | 0 bytes/s, done. +Total 4 (delta 2), reused 0 (delta 0) +To ../../.t\tmprepo59 + 55cc242..f01e945 master -> synced/master + * [new branch] git-annex -> synced/git-annex +[adjusted/master(unlocked) d60d0d5] git-annex in .t\tmprepo59 + 1 file changed, 1 insertion(+), 1 deletion(-) +CONFLICT (modify/delete): conflictor deleted in refs/heads/synced/master and modified in HEAD. Version HEAD of conflicto +r left in tree. +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD af662a3] git-annex automatic merge conflict fix +Updating d60d0d5..2584833 +Fast-forward + conflictor => conflictor.variant-0cbf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + rename conflictor => conflictor.variant-0cbf (98%) +remote: Counting objects: 4, done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 4 (delta 0), reused 0 (delta 0) +Unpacking objects: 100% (4/4), done. +From ../../.t\tmprepo58 + + 8291a6a...c7986fa adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) + b2dee3f..5c73f12 git-annex -> r1/git-annex + 55cc242..f01e945 master -> r1/master + 55cc242..f01e945 synced/master -> r1/synced/master +Counting objects: 5, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (5/5), done. +Writing objects: 100% (5/5), 680 bytes | 0 bytes/s, done. +Total 5 (delta 1), reused 0 (delta 0) +To ../../.t\tmprepo58 + b2dee3f..5c73f12 git-annex -> synced/git-annex + f01e945..af662a3 master -> synced/master +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating f01e945..af662a3 +Fast-forward + conflictor.variant-0cbf | 1 + + 1 file changed, 1 insertion(+) + create mode 120000 conflictor.variant-0cbf +Updating c7986fa..2965015 +Fast-forward + conflictor.variant-0cbf | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 conflictor.variant-0cbf +remote: Counting objects: 5, done. +remote: Compressing objects: 100% (4/4), done. +remote: Total 5 (delta 1), reused 0 (delta 0) +Unpacking objects: 100% (5/5), done. +From ../../.t\tmprepo59 + + e665450...49f18da adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) + 5c73f12..317f667 git-annex -> r2/git-annex + f01e945..af662a3 master -> r2/master + f01e945..af662a3 synced/master -> r2/synced/master + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 4933941] git-annex in .t\tmprepo60 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 3), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo60 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD a57143f] git-annex automatic merge conflict fix +Updating 75480f7..b8f5d68 +Fast-forward + conflictor | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor +Counting objects: 14, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (14/14), done. +Writing objects: 100% (14/14), 1.46 KiB | 0 bytes/s, done. +Total 14 (delta 7), reused 0 (delta 0) +To ../../.t\tmprepo60 + 41acfd6..a57143f master -> synced/master + * [new branch] git-annex -> synced/git-annex +[adjusted/master(unlocked) 5f6a63e] git-annex in .t\tmprepo61 + 1 file changed, 1 insertion(+), 1 deletion(-) +Counting objects: 8, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (7/7), done. +Writing objects: 100% (8/8), 853 bytes | 0 bytes/s, done. +Total 8 (delta 2), reused 0 (delta 0) +To ../../.t\tmprepo60 + 261f2b0..0908b36 git-annex -> synced/git-annex + a57143f..828e91b master -> synced/master +[adjusted/master(unlocked) fdcc819] git-annex in .t\tmprepo60 + 1 file changed, 1 deletion(-) + delete mode 100644 conflictor +CONFLICT (modify/delete): conflictor deleted in HEAD and modified in refs/heads/synced/master. Version refs/heads/synced +/master of conflictor left in tree. +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 4151827] git-annex automatic merge conflict fix +Updating fdcc819..975b799 +Fast-forward + conflictor.variant-0cbf | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor.variant-0cbf +remote: Counting objects: 10, done. +remote: Compressing objects: 100% (9/9), done. +remote: Total 10 (delta 1), reused 0 (delta 0) +Unpacking objects: 100% (10/10), done. +From ../../.t\tmprepo61 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Counting objects: 5, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (5/5), done. +Writing objects: 100% (5/5), 695 bytes | 0 bytes/s, done. +Total 5 (delta 1), reused 0 (delta 0) +To ../../.t\tmprepo61 + 828e91b..4151827 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 828e91b..4151827 +Fast-forward + conflictor | 1 - + conflictor.variant-0cbf | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + delete mode 120000 conflictor + create mode 120000 conflictor.variant-0cbf +Updating 8780774..c4c9055 +Fast-forward + conflictor => conflictor.variant-0cbf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + rename conflictor => conflictor.variant-0cbf (98%) +From ../../.t\tmprepo60 + + 7ceafed...f885d4b adjusted/master(unlocked) -> r1/adjusted/master(unlocked) (forced update) + 0908b36..45e8d64 git-annex -> r1/git-annex + 828e91b..4151827 master -> r1/master + 828e91b..4151827 synced/master -> r1/synced/master +OK (18.00s) + conflict resolution (nonannexed file): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 4438cd9] git-annex in .t\tmprepo62 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) 7d984b7] git-annex in .t\tmprepo63 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 17, done. +remote: Compressing objects: 100% (15/15), done. +remote: Total 17 (delta 2), reused 0 (delta 0) +Unpacking objects: 100% (17/17), done. +From ../../.t\tmprepo63 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD ddbc6a3] git-annex automatic merge conflict fix +Updating c42b305..90fd358 +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +Counting objects: 22, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (21/21), done. +Writing objects: 100% (22/22), 2.25 KiB | 0 bytes/s, done. +Total 22 (delta 9), reused 0 (delta 0) +To ../../.t\tmprepo63 + 6ae609a..ddbc6a3 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 6ae609a..ddbc6a3 +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 120000 conflictor.variant-cc12 +Updating 8714c6e..d884f3f +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor.variant-cc12 +From ../../.t\tmprepo62 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 99fd1b3] git-annex in .t\tmprepo64 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) 30452d4] git-annex in .t\tmprepo65 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo64 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 46ec327] git-annex automatic merge conflict fix +Updating 818dce1..9788dab +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor.variant-cc12 +Counting objects: 18, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (17/17), done. +Writing objects: 100% (18/18), 1.69 KiB | 0 bytes/s, done. +Total 18 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo64 + 6ae34c0..46ec327 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 6ae34c0..46ec327 +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + sha1foo | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + mode change 120000 => 100644 conflictor + create mode 120000 conflictor.variant-cc12 +Updating aa27001..eb304ba +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +From ../../.t\tmprepo65 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 34af785] git-annex in .t\tmprepo66 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) d1ad368] git-annex in .t\tmprepo67 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 17, done. +remote: Compressing objects: 100% (15/15), done. +remote: Total 17 (delta 1), reused 0 (delta 0) +Unpacking objects: 100% (17/17), done. +From ../../.t\tmprepo67 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD b6643ac] git-annex automatic merge conflict fix +Updating 58a264d..7f1e818 +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +Counting objects: 22, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (21/21), done. +Writing objects: 100% (22/22), 2.30 KiB | 0 bytes/s, done. +Total 22 (delta 8), reused 0 (delta 0) +To ../../.t\tmprepo67 + ad93099..b6643ac master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating ad93099..b6643ac +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 120000 conflictor.variant-cc12 +Updating f042552..0b591c1 +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor.variant-cc12 +From ../../.t\tmprepo66 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) aabedb4] git-annex in .t\tmprepo68 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) 0666b67] git-annex in .t\tmprepo69 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo68 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +conflictor: needs merge +[detached HEAD 15337ba] git-annex automatic merge conflict fix +Updating d8e1daa..2bdecc4 +Fast-forward + conflictor.variant-cc12 | 1 + + foo | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 conflictor.variant-cc12 +Counting objects: 18, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (17/17), done. +Writing objects: 100% (18/18), 1.69 KiB | 0 bytes/s, done. +Total 18 (delta 10), reused 0 (delta 0) +To ../../.t\tmprepo68 + 0322df0..15337ba master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 0322df0..15337ba +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + sha1foo | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + mode change 120000 => 100644 conflictor + create mode 120000 conflictor.variant-cc12 +Updating f638189..62dac7e +Fast-forward + conflictor | 2 +- + conflictor.variant-cc12 | 1 + + foo | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 conflictor.variant-cc12 +From ../../.t\tmprepo69 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +OK (25.61s) + conflict resolution (nonannexed symlink): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (7.43s) + conflict resolution (mixed locked and unlocked file): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +[adjusted/master(unlocked) 6c05187] git-annex in .t\tmprepo78 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +[adjusted/master(unlocked) 3968c28] git-annex in .t\tmprepo79 + 1 file changed, 1 insertion(+) + create mode 100644 conflictor +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +remote: Counting objects: 23, done. +remote: Compressing objects: 100% (21/21), done. +remote: Total 23 (delta 4), reused 0 (delta 0) +Unpacking objects: 100% (23/23), done. +From ../../.t\tmprepo79 + * [new branch] adjusted/master(unlocked) -> r2/adjusted/master(unlocked) + * [new branch] git-annex -> r2/git-annex + * [new branch] master -> r2/master + * [new branch] synced/master -> r2/synced/master +Auto-merging sha1foo +CONFLICT (add/add): Merge conflict in sha1foo +Auto-merging foo +CONFLICT (add/add): Merge conflict in foo +Auto-merging conflictor +CONFLICT (add/add): Merge conflict in conflictor +Automatic merge failed; fix conflicts and then commit the result. +[detached HEAD 54748a5] git-annex automatic merge conflict fix +Updating 0cafe66..1f3fc72 +Fast-forward + conflictor | 2 +- + foo | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Counting objects: 24, done. +Delta compression using up to 4 threads. +Compressing objects: 100% (22/22), done. +Writing objects: 100% (24/24), 2.07 KiB | 0 bytes/s, done. +Total 24 (delta 14), reused 0 (delta 0) +To ../../.t\tmprepo79 + 9223b4e..54748a5 master -> synced/master + * [new branch] git-annex -> synced/git-annex +On branch adjusted/master(unlocked) +nothing to commit, working tree clean +Updating 9223b4e..54748a5 +Fast-forward + conflictor | 2 +- + foo | 2 +- + sha1foo | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Updating 592ec16..001733a +Fast-forward + conflictor | 2 +- + foo | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +From ../../.t\tmprepo78 + * [new branch] adjusted/master(unlocked) -> r1/adjusted/master(unlocked) + * [new branch] git-annex -> r1/git-annex + * [new branch] master -> r1/master + * [new branch] synced/master -> r1/synced/master +[adjusted/master(unlocked) 43e95b6] git-annex in .t\tmprepo78 + 1 file changed, 1 insertion(+), 1 deletion(-) +From ../../.t\tmprepo79 + + 592ec16...7fbe351 adjusted/master(unlocked) -> r2/adjusted/master(unlocked) (forced update) +Counting objects: 1, done. +Writing objects: 100% (1/1), 191 bytes | 0 bytes/s, done. +Total 1 (delta 0), reused 0 (delta 0) +To ../../.t\tmprepo79 + 54748a5..a15aa8c master -> synced/master +conflictor +conflictor +OK (7.72s) + map: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.25s) + uninit: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.63s) + uninit (in git-annex branch): Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +Switched to branch 'git-annex' +OK (1.49s) + upgrade: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (0.99s) + whereis: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.34s) + hook remote: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (0.97s) + directory remote: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (2.65s) + rsync remote: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (3.92s) + bup remote: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OKgpg testing not implemented on Windows + (0.99s) + crypto: OK + preferred content: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +wanted . ok +(recording state in git...) +group . ok +(recording state in git...) +wanted . ok +(recording state in git...) +group . ok +(recording state in git...) +wanted . ok +(recording state in git...) +OK (5.19s) + add subdirs: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +OK (1.96s) + addurl: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. +curl: (37) Couldn't open file /test2/.t/tmprepo91/myurl +removeDirectoryRecursive: permission denied (Zugriff verweigert) +sleeping 10 seconds and will retry directory cleanup +FAIL + Exception: removeDirectoryRecursive: permission denied (Zugriff verweigert) + Unit Tests v5 direct + add dup: Init Tests + init: Detected a filesystem without fifo support. + Disabling ssh connection caching. + Detected a crippled filesystem. + Entering an adjusted branch where files are unlocked as this filesystem does not support locked files. + adjusted branch adjusted/master(unlocked) already exists. + Aborting because that branch may have changes that have not yet reached master + You can check out the adjusted branch manually to enter it, or delete the adjusted branch and re-run this command. + Failed to enter adjusted branch! +FAIL (0.59s) + git annex direct failed + add: FAIL (0.18s) + foo is not a (crippled) symlink + +2 out of 2 tests failed (0.76s) +FAIL + Exception: init tests failed! cannot continue + add extras: FAIL + Exception: init tests failed! cannot continue + shared clone: FAIL + Exception: init tests failed! cannot continue + log: FAIL + Exception: init tests failed! cannot continue + import: FAIL + Exception: init tests failed! cannot continue + reinject: FAIL + Exception: init tests failed! cannot continue + unannex (no copy): FAIL + Exception: init tests failed! cannot continue + unannex (with copy): FAIL + Exception: init tests failed! cannot continue + drop (no remote): FAIL + Exception: init tests failed! cannot continue + drop (with remote): FAIL + Exception: init tests failed! cannot continue + drop (untrusted remote): FAIL + Exception: init tests failed! cannot continue + get: FAIL + Exception: init tests failed! cannot continue + get (ssh remote): FAIL + Exception: init tests failed! cannot continue + move: FAIL + Exception: init tests failed! cannot continue + move (ssh remote): FAIL + Exception: init tests failed! cannot continue + copy: FAIL + Exception: init tests failed! cannot continue + lock: FAIL + Exception: init tests failed! cannot continue + lock (v6 --force): FAIL + Exception: init tests failed! cannot continue + edit (no pre-commit): FAIL + Exception: init tests failed! cannot continue + edit (pre-commit): FAIL + Exception: init tests failed! cannot continue + partial commit: FAIL + Exception: init tests failed! cannot continue + fix: FAIL + Exception: init tests failed! cannot continue + direct: FAIL + Exception: init tests failed! cannot continue + trust: FAIL + Exception: init tests failed! cannot continue + fsck (basics): FAIL + Exception: init tests failed! cannot continue + fsck (bare): FAIL + Exception: init tests failed! cannot continue + fsck (local untrusted): FAIL + Exception: init tests failed! cannot continue + fsck (remote untrusted): FAIL + Exception: init tests failed! cannot continue + fsck --from remote: FAIL + Exception: init tests failed! cannot continue + migrate: FAIL + Exception: init tests failed! cannot continue + migrate (via gitattributes): FAIL + Exception: init tests failed! cannot continue + unused: FAIL + Exception: init tests failed! cannot continue + describe: FAIL + Exception: init tests failed! cannot continue + find: FAIL + Exception: init tests failed! cannot continue + merge: FAIL + Exception: init tests failed! cannot continue + info: FAIL + Exception: init tests failed! cannot continue + version: FAIL + Exception: init tests failed! cannot continue + sync: FAIL + Exception: init tests failed! cannot continue + union merge regression: FAIL + Exception: init tests failed! cannot continue + adjusted branch merge regression: FAIL + Exception: init tests failed! cannot continue + adjusted branch subtree regression: FAIL + Exception: init tests failed! cannot continue + conflict resolution: FAIL + Exception: init tests failed! cannot continue + conflict resolution (adjusted branch): FAIL + Exception: init tests failed! cannot continue + conflict resolution movein regression: FAIL + Exception: init tests failed! cannot continue + conflict resolution (mixed directory and file): FAIL + Exception: init tests failed! cannot continue + conflict resolution symlink bit: FAIL + Exception: init tests failed! cannot continue + conflict resolution (uncommitted local file): FAIL + Exception: init tests failed! cannot continue + conflict resolution (removed file): FAIL + Exception: init tests failed! cannot continue + conflict resolution (nonannexed file): FAIL + Exception: init tests failed! cannot continue + conflict resolution (nonannexed symlink): FAIL + Exception: init tests failed! cannot continue + conflict resolution (mixed locked and unlocked file): FAIL + Exception: init tests failed! cannot continue + map: FAIL + Exception: init tests failed! cannot continue + uninit: FAIL + Exception: init tests failed! cannot continue + uninit (in git-annex branch): FAIL + Exception: init tests failed! cannot continue + upgrade: FAIL + Exception: init tests failed! cannot continue + whereis: FAIL + Exception: init tests failed! cannot continue + hook remote: FAIL + Exception: init tests failed! cannot continue + directory remote: FAIL + Exception: init tests failed! cannot continue + rsync remote: FAIL + Exception: init tests failed! cannot continue + bup remote: FAIL + Exception: init tests failed! cannot continue + crypto: FAIL + Exception: init tests failed! cannot continue + preferred content: FAIL + Exception: init tests failed! cannot continue + add subdirs: FAIL + Exception: init tests failed! cannot continue + addurl: FAIL + Exception: init tests failed! cannot continue + +74 out of 165 tests failed (406.30s) + (This could be due to a bug in git-annex, or an incompatibility + with utilities, such as git, installed on this system.) +PS G:\test2> + +# End of transcript or log. +"""]] + +### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) + +Of course! On Linux, it runs perfectly. I manage all my data with git-annex. |