### Please describe the problem. On test fails when running "git annex test" on Windows. ### What steps will reproduce the problem? Install Git-1.8.5.2-preview20131230 Install git-annex-5.20131222 Run "git annex test" in cmd ### What version of git-annex are you using? On what operating system? git-annex-5.20131222 on Windows 7 Professional ### Please provide any additional information below. The failed test is "test_mixed_conflict_resolution" with "conflictor directory missing". The problem can also be reproduced with the attached batch script. (EDIT: I couldn't attach a file, so I pasted its contents below the log.) You can find the complete output of "git annex test" below. [[!format text """ Tests QuickCheck prop_idempotent_deencode_git: OK +++ OK, passed 100 tests. prop_idempotent_deencode: OK +++ OK, passed 100 tests. prop_idempotent_fileKey: OK +++ OK, passed 100 tests. prop_idempotent_key_encode: OK +++ OK, passed 100 tests. prop_idempotent_key_decode: OK +++ OK, passed 100 tests. prop_idempotent_shellEscape: OK +++ OK, passed 100 tests. prop_idempotent_shellEscape_multiword: OK +++ OK, passed 100 tests. prop_logs_sane: OK +++ OK, passed 100 tests. prop_idempotent_configEscape: OK +++ OK, passed 100 tests. prop_parse_show_Config: OK +++ OK, passed 100 tests. prop_parentDir_basics: OK +++ OK, passed 100 tests. prop_relPathDirToFile_basics: OK +++ OK, passed 100 tests. prop_relPathDirToFile_regressionTest: OK +++ OK, passed 100 tests. prop_cost_sane: OK +++ OK, passed 100 tests. prop_matcher_sane: OK +++ OK, passed 100 tests. prop_HmacSha1WithCipher_sane: OK +++ OK, passed 100 tests. prop_TimeStamp_sane: OK +++ OK, passed 100 tests. prop_addLog_sane: OK +++ OK, passed 100 tests. prop_verifiable_sane: OK +++ OK, passed 100 tests. prop_segment_regressionTest: OK +++ OK, passed 100 tests. prop_read_write_transferinfo: OK +++ OK, passed 100 tests. prop_read_show_inodecache: OK +++ OK, passed 100 tests. prop_parse_show_log: OK +++ OK, passed 100 tests. prop_read_show_TrustLevel: OK +++ OK, passed 100 tests. prop_parse_show_TrustLog: OK +++ OK, passed 100 tests. prop_hashes_stable: OK +++ OK, passed 100 tests. prop_schedule_roundtrips: OK +++ OK, passed 100 tests. prop_duration_roundtrips: OK +++ OK, passed 100 tests. Unit Tests init: init test repo Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. ok (Recording state in git...) OK add: add foo ok (Recording state in git...) add sha1foo ok (Recording state in git...) add apple ok (Recording state in git...) fatal: This operation must be run in a work tree commit (Recording state in git...) ok (Recording state in git...) OK add sha1dup: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. add sha1foodup cygwin warning: MS-DOS style path detected: C:\Users\Tobias\testdir\t2\.t\tmprepo0\.git\annex\tmp\tmp5876 Preferred POSIX equivalent is: /cygdrive/c/Users/Tobias/testdir/t2/.t/tmprepo0/.git/annex/tmp/tmp5876 CYGWIN environment variable option "nodosfilewarning" turns off this warning. Consult the user's guide for more details about POSIX paths: http://cygwin.com/cygwin-ug-net/using.html#using-pathnames ok (Recording state in git...) OK add subdirs: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. add dir/foo cygwin warning: MS-DOS style path detected: C:\Users\Tobias\testdir\t2\.t\tmprepo1\.git\annex\tmp\tmp3396 Preferred POSIX equivalent is: /cygdrive/c/Users/Tobias/testdir/t2/.t/tmprepo1/.git/annex/tmp/tmp3396 CYGWIN environment variable option "nodosfilewarning" turns off this warning. Consult the user's guide for more details about POSIX paths: http://cygwin.com/cygwin-ug-net/using.html#using-pathnames ok (Recording state in git...) OK reinject: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK unannex (no copy): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. OK unannex (with copy): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) unannex foo ok (Recording state in git...) OK drop (no remote): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Try making some of these repositories available: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- test repo (Use --force to override this check, or adjust annex.numcopies.) failed git-annex: drop: 1 failed drop foo ok (Recording state in git...) OK drop (with remote): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 78.67 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) drop foo ok (Recording state in git...) OK drop (untrusted remote): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. untrust origin (merging origin/git-annex into git-annex...) (Recording state in git...) ok (Recording state in git...) get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 78.67 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) drop foo (unsafe) Could only verify the existence of 0 out of 1 necessary copies Also these untrusted repositories may contain the file: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) (Use --force to override this check, or adjust annex.numcopies.) failed git-annex: drop: 1 failed OK get: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) OK move: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. move foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) move foo (to origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) OK copy: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. copy foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) copy foo ok move foo ok (Recording state in git...) OK lock: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK edit (no pre-commit): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK edit (pre-commit): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK fix: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK trust: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. trust origin (merging origin/git-annex into git-annex...) (Recording state in git...) ok (Recording state in git...) trust origin ok (Recording state in git...) untrust origin ok (Recording state in git...) untrust origin ok (Recording state in git...) dead origin ok (Recording state in git...) dead origin ok (Recording state in git...) semitrust origin ok (Recording state in git...) semitrust origin ok (Recording state in git...) OK fsck (basics): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. fsck foo (merging origin/git-annex into git-annex...) (Recording state in git...) ok fsck sha1foo ok fsck foo Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. failed fsck sha1foo Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. failed git-annex: fsck: 2 failed get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) fsck foo ok fsck sha1foo ok fsck foo ok fsck sha1foo ok get sha1foo (from origin...) sha1foo 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 96 bytes received 31 bytes 254.00 bytes/sec total size is 25 speedup is 0.20 ok (Recording state in git...) fsck foo ok fsck sha1foo ok fsck foo ok fsck sha1foo ok OK fsck (bare): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. fsck SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77 ok fsck WORM-s25-m1388499859--apple ok fsck SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa ok OK fsck (local untrusted): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 78.67 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) untrust origin ok (Recording state in git...) untrust . ok (Recording state in git...) fsck foo Only these untrusted locations may have copies of foo 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) 68deb80b-3a46-42f9-bb58-0f3b5a689d28 -- here (.t\tmprepo18) Back it up to trusted locations with git-annex copy. failed fsck sha1foo Only these untrusted locations may have copies of sha1foo 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) Back it up to trusted locations with git-annex copy. failed git-annex: fsck: 2 failed trust . ok (Recording state in git...) fsck foo ok OK fsck (remote untrusted): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) get sha1foo (from origin...) sha1foo 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 96 bytes received 31 bytes 254.00 bytes/sec total size is 25 speedup is 0.20 ok (Recording state in git...) fsck foo ok fsck sha1foo ok untrust origin ok (Recording state in git...) fsck foo Only 1 of 2 trustworthy copies exist of foo Back it up with git-annex copy. The following untrusted locations may also have copies: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) failed fsck sha1foo Only 1 of 2 trustworthy copies exist of sha1foo Back it up with git-annex copy. The following untrusted locations may also have copies: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) failed git-annex: fsck: 2 failed OK migrate: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK migrate (via gitattributes): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK unused: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK describe: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. describe . ok (Recording state in git...) describe origin (merging origin/git-annex into git-annex...) (Recording state in git...) ok (Recording state in git...) OK find: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) foo foo sha1foo sha1foo add dir/subfile ok (Recording state in git...) dir/subfile OK merge: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. merge git-annex (merging origin/git-annex into git-annex...) (Recording state in git...) ok OK info: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. {"command":"info","repository mode":"direct","trusted repositories":[],"semitrusted repositories":[{"uuid":"00000000-0000-0000-0000-000000000001","description":"web","here":false},{"uuid":"3bbb68d2-9ef1-4126-bee5-f60569f8ad82","description":"origin (test repo)","here":false},{"uuid":"fe838913-724e-4fb1-a47f-4b3815b1aab5","description":".t\\tmprepo26","here":true}],"untrusted repositories":[],"available local disk space":"7.78 gigabytes (+1 megabyte reserved)","local annex keys":0,"local annex size":"0 bytes","annexed files in working tree":2,"size of annexed files in working tree":"45 bytes","bloom filter size":"16 mebibytes (0% full)","success":true} OK version: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. git-annex version: 5.20131230-g192d991 build flags: Assistant Webapp Pairing Testsuite S3 WebDAV DNS 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 webdav glacier hook external local repository version: 5 supported repository version: 5 upgrade supported from repository versions: 2 3 4 OK sync: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. (merging origin/git-annex into git-annex...) (Recording state in git...) commit ok pull origin bash.exe: warning: could not find /tmp, please create! ok push origin bash.exe: warning: could not find /tmp, please create! To C:/Users/Tobias/testdir/t2/.t\repo * [new branch] git-annex -> synced/git-annex ok OK union merge regression: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 78.67 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) commit ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo30 * [new branch] annex/direct/master -> r2/annex/direct/master * [new branch] git-annex -> r2/git-annex ok pull r1 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo29 * [new branch] annex/direct/master -> r1/annex/direct/master * [new branch] git-annex -> r1/git-annex ok (merging r1/git-annex r2/git-annex into git-annex...) (Recording state in git...) push r2 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo30 * [new branch] git-annex -> synced/git-annex * [new branch] annex/direct/master -> synced/master ok push r1 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo29 * [new branch] git-annex -> synced/git-annex * [new branch] annex/direct/master -> synced/master ok (merging synced/git-annex into git-annex...) commit ok pull r3 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo31 * [new branch] annex/direct/master -> r3/annex/direct/master * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r1 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo29 * [new branch] annex/direct/master -> r1/annex/direct/master * [new branch] git-annex -> r1/git-annex * [new branch] master -> r1/master * [new branch] synced/git-annex -> r1/synced/git-annex * [new branch] synced/master -> r1/synced/master ok push r1 bash.exe: warning: could not find /tmp, please create! Everything up-to-date ok (merging synced/git-annex into git-annex...) commit ok pull r3 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo31 * [new branch] annex/direct/master -> r3/annex/direct/master * [new branch] git-annex -> r3/git-annex * [new branch] master -> r3/master * [new branch] synced/master -> r3/synced/master ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo30 * [new branch] annex/direct/master -> r2/annex/direct/master * [new branch] git-annex -> r2/git-annex * [new branch] master -> r2/master * [new branch] synced/git-annex -> r2/synced/git-annex * [new branch] synced/master -> r2/synced/master ok drop foo ok (Recording state in git...) drop foo ok (Recording state in git...) commit ok pull r3 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo31 55d5b14..3b6c15d git-annex -> r3/git-annex ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo30 55d5b14..a4599c9 git-annex -> r2/git-annex ok (merging r2/git-annex r3/git-annex into git-annex...) (Recording state in git...) push r3 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo31 * [new branch] git-annex -> synced/git-annex ok push r2 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo30 55d5b14..4ff2e44 git-annex -> synced/git-annex ok OK conflict resolution: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok get sha1foo (from origin...) sha1foo 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 96 bytes received 31 bytes 254.00 bytes/sec total size is 25 speedup is 0.20 ok (Recording state in git...) get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok get sha1foo (from origin...) sha1foo 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 96 bytes received 31 bytes 254.00 bytes/sec total size is 25 speedup is 0.20 ok (Recording state in git...) commit add foo ok (Recording state in git...) ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo33 * [new branch] annex/direct/master -> r2/annex/direct/master * [new branch] git-annex -> r2/git-annex ok (merging r2/git-annex into git-annex...) (Recording state in git...) push r2 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo33 * [new branch] git-annex -> synced/git-annex * [new branch] annex/direct/master -> synced/master ok (merging synced/git-annex into git-annex...) commit add foo ok (Recording state in git...) ok merge synced/master Auto-merging foo CONFLICT (content): Merge conflict in foo Automatic merge failed; fix conflicts and then commit the result. foo: needs merge [annex/direct/master ab51abe] git-annex automatic merge conflict fix (Recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok pull r1 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo32 * [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 ok (Recording state in git...) push r1 bash.exe: warning: could not find /tmp, please create! To ../../.t\tmprepo32 0c0b4c1..ab51abe annex/direct/master -> synced/master * [new branch] git-annex -> synced/git-annex ok (merging synced/git-annex into git-annex...) commit ok merge synced/master Updating 0c0b4c1..ab51abe Fast-forward foo | 1 - foo.variant-0b0e | 1 + foo.variant-bc25 | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 120000 foo create mode 120000 foo.variant-0b0e create mode 120000 foo.variant-bc25 ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo33 09047a9..ab51abe annex/direct/master -> r2/annex/direct/master 6208675..2aef6c1 git-annex -> r2/git-annex 0c0b4c1..ab51abe master -> r2/master 0c0b4c1..ab51abe synced/master -> r2/synced/master ok get foo.variant-bc25 (from r2...) foo.variant-bc25 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 102 bytes received 31 bytes 266.00 bytes/sec total size is 22 speedup is 0.17 ok (Recording state in git...) get foo.variant-0b0e (from r1...) foo.variant-0b0e 22 100% 0.00kB/s 0:00:00 22 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 102 bytes received 31 bytes 266.00 bytes/sec total size is 22 speedup is 0.17 ok (Recording state in git...) OK conflict_resolution (mixed directory and file): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. add conflictor ok (Recording state in git...) (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) commit ok pull origin bash.exe: warning: could not find /tmp, please create! ok push origin bash.exe: warning: could not find /tmp, please create! To C:/Users/Tobias/testdir/t2/.t\repo 488868c..2ab23aa git-annex -> synced/git-annex 09047a9..fdc68bf annex/direct/master -> synced/master ok add conflictor/subfile ok (Recording state in git...) (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) commit ok pull origin bash.exe: warning: could not find /tmp, please create! From C:/Users/Tobias/testdir/t2/.t\repo 09047a9..fdc68bf master -> origin/master 488868c..2ab23aa synced/git-annex -> origin/synced/git-annex 09047a9..fdc68bf 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 [annex/direct/master 77177a0] git-annex automatic merge conflict fix (Recording state in git...) Merge conflict was automatically resolved; you may want to examine the result. ok (merging origin/synced/git-annex into git-annex...) (Recording state in git...) push origin bash.exe: warning: could not find /tmp, please create! To C:/Users/Tobias/testdir/t2/.t\repo 2ab23aa..0ba8d35 git-annex -> synced/git-annex fdc68bf..77177a0 annex/direct/master -> synced/master ok commit ok pull r2 bash.exe: warning: could not find /tmp, please create! From ../../.t\tmprepo35 * [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 Updating fdc68bf..77177a0 Fast-forward conflictor | 1 - conflictor.variant-cc12 | 1 + conflictor/subfile | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 120000 conflictor create mode 120000 conflictor.variant-cc12 create mode 120000 conflictor/subfile Already up-to-date. ok (merging r2/git-annex into git-annex...) FAIL .t\tmprepo34 conflictor directory missing map: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. describe . ok (Recording state in git...) describe origin (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) ok (Recording state in git...) map C:\Users\Tobias\testdir\t2\.t\tmprepo36 ok map C:\Users\Tobias\testdir\t2\.t\repo ok ok OK uninit: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. get foo (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok get sha1foo (from origin...) sha1foo 25 100% 0.00kB/s 0:00:00 25 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 96 bytes received 31 bytes 254.00 bytes/sec total size is 25 speedup is 0.20 ok (Recording state in git...) unannex foo ok unannex sha1foo git-annex: C:\Users\Tobias\testdir\t2\.t\tmprepo37\.git\annex\objects\ecb\0b5\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa.map4964.tmp: MoveFileEx "C:\\Users\\Tobias\\testdir\\t2\\.t\\tmprepo37\\.git\\annex\\objects\\ecb\\0b5\\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa\\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa.map4964.tmp" "C:\\Users\\Tobias\\testdir\\t2\\.t\\tmprepo37\\.git\\annex\\objects\\ecb\\0b5\\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa\\SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa.map": permission denied (Access is denied.) failed git-annex: Not fully uninitialized Some annexed data is still left in C:\Users\Tobias\testdir\t2\.t\tmprepo37\.git\annex\objects\ This may include deleted files, or old versions of modified files. If you don't care about preserving the data, just delete the directory. Or, you can move it to another location, in case it turns out something in there is important. Or, you can run `git annex unused` followed by `git annex dropunused` to remove data that is not used by any tag or branch, which might take care of all the data. Then run `git annex uninit` again to finish. OK uninit (in git-annex branch): Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. not supported in direct mode; skipping OK upgrade: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. upgrade . ok OK whereis: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. whereis foo (1 copy) 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) ok untrust origin ok (Recording state in git...) whereis foo (0 copies) The following untrusted locations may also have copies: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) failed git-annex: whereis: 1 failed get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) whereis foo (1 copy) 28bccded-ea59-4d64-bf20-d58540e72892 -- here (.t\tmprepo40) The following untrusted locations may also have copies: 3bbb68d2-9ef1-4126-bee5-f60569f8ad82 -- origin (test repo) ok OK hook remote: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. OK directory remote: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. (merging origin/git-annex origin/synced/git-annex into git-annex...) (Recording state in git...) initremote foo ok (Recording state in git...) get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) copy foo (to foo...) 100% 0.0 B/s 0s ok (Recording state in git...) drop foo ok (Recording state in git...) move foo (from foo...) 100% 0.0 B/s 0s ok (Recording state in git...) drop foo (unsafe) Could only verify the existence of 1 out of 2 necessary copies Rather than dropping this file, try using: git annex move (Use --force to override this check, or adjust annex.numcopies.) failed git-annex: drop: 1 failed OK rsync remote: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. OK bup remote: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. OKg pg t e sctriynpgt on:o t i m p l e m e n t e d o n W i n d o w s OK preferred content: Detected a filesystem without fifo support. Disabling ssh connection caching. Detected a crippled filesystem. Enabling direct mode. wanted . ok (Recording state in git...) group . ok (Recording state in git...) get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) ungroup . ok (Recording state in git...) wanted . ok (Recording state in git...) group . ok (Recording state in git...) drop foo ok (Recording state in git...) ungroup . ok (Recording state in git...) wanted . ok (Recording state in git...) get foo (from origin...) foo 20 100% 0.00kB/s 0:00:00 20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1) sent 87 bytes received 31 bytes 236.00 bytes/sec total size is 20 speedup is 0.17 ok (Recording state in git...) drop foo ok (Recording state in git...) OK global cleanup: OK 1 out of 74 tests failed (This could be due to a bug in git-annex, or an incompatability with utilities, such as git, installed on this system.) """]] batch script to reproduce the problem in the cmd shell: [[!format bat """ mkdir repo cd repo git init git annex init "main repo" echo x > f1 git annex add f1 git annex sync cd .. git clone repo r1 git clone repo r2 cd r1 echo xyz > conflictor git annex add conflictor git annex sync cd ..\r2 mkdir conflictor echo abc > conflictor\subfile git annex add conflictor\subfile git annex sync cd ..\r1 git remote add r2 ..\r2 git remote remove origin cd ..\r2 git remote add r1 ..\r1 git remote remove origin cd ..\r1 git annex sync cd ..\r2 git annex sync cd .. dir repo r1 r2 """]] > Yet another wonderful case of \\ vs / confusion. [[fixed|done]]. > > That sucked, but I am rather stunned that the rest of the test > suite passes for you. That's a lot better that it's ever done on windows > before. Sadly I don't have as much luck on XP, still 9 failing tests > there. > > --[[Joey]]