Merge branch 'master' of ssh://git-annex.branchable.com

12 files changed, 1360 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn
new file mode 100644
index 000000000..61862a099
--- /dev/null
+++ b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn
@@ -0,0 +1,29 @@
+The assistant from the standalone 64bit build crashes upon startup.
+
+### Version information
+
+     [0 zerodogg@firefly annexed]$ git annex version
+     git-annex version: 5.20131230-g4aa88d8
+     build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
+     key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 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: 0 1 2 4
+     [0 zerodogg@firefly annexed]$ uname -a
+     Linux firefly 3.12.5-302.fc20.x86_64 #1 SMP Tue Dec 17 20:42:32 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux
+     [0 zerodogg@firefly annexed]$ cat /etc/fedora-release 
+     Fedora release 20 (Heisenbug)
+     [0 zerodogg@firefly annexed]$ 
+
+### Error
+
+     [0 zerodogg@firefly annexed]$ git annex webapp
+     Launching web browser on file:///home/zerodogg/Documents/annexed/.git/annex/webapp.html
+     
+     (process:6045): GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed
+     libgcc_s.so.1 must be installed for pthread_cancel to work
+     error: git-annex died of signal 6
+     [134 zerodogg@firefly annexed]$ ls -l /usr/lib64/libgcc_s.so.1
+     lrwxrwxrwx. 1 root root 28 2013-12-18 10:54 /usr/lib64/libgcc_s.so.1 -> libgcc_s-4.8.2-20131212.so.1
+     [0 zerodogg@firefly annexed]$ 
diff --git a/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn
new file mode 100644
index 000000000..0aa24a91e
--- /dev/null
+++ b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn
@@ -0,0 +1,1166 @@
+### 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
+"""]]
diff --git a/doc/bugs/assistant_using_the_incorrect_path_on_windows__63__.mdwn b/doc/bugs/assistant_using_the_incorrect_path_on_windows__63__.mdwn
new file mode 100644
index 000000000..387ba7416
--- /dev/null
+++ b/doc/bugs/assistant_using_the_incorrect_path_on_windows__63__.mdwn
@@ -0,0 +1,42 @@
+### Please describe the problem.
+The assistant (or rather the programs it's running) appears to be using unix-style paths instead of cygwin paths, causing several types of errors. A selection of items from the terminal:
+
+[[!format sh """
+Launching web browser on file://C:\Users\Familyroom\annex\.git\annex\webapp.html
+[2013-12-31 01:14:05 Eastern Standard Time] read: ssh-keygen ["-F","celebdil.db4
+8x.net"]
+ssh-keygen: /home/Familyroom/.ssh/known_hosts: No such file or directory
+[2013-12-31 01:14:05 Eastern Standard Time] read: ssh ["-oNumberOfPasswordPrompt
+s=0","-oStrictHostKeyChecking=no","-n","-p","22","rlbrooks@celebdil.db48x.net","
+sh -c 'echo git-annex-probe loggedin;if which git-annex-shell; then echo git-ann
+ex-probe git-annex-shell; fi;if which git; then echo git-annex-probe git; fi;if
+which rsync; then echo git-annex-probe rsync; fi;if which ~/.ssh/git-annex-shell
+; then echo git-annex-probe ~/.ssh/git-annex-shell; fi;cd '\"'\"'annex'\"'\"' &&
+ git config --list'"]
+[2013-12-31 01:14:08 Eastern Standard Time] read: ssh-keygen ["-F","celebdil.db4
+8x.net"]
+ssh-keygen: /home/Familyroom/.ssh/known_hosts: No such file or directory
+[2013-12-31 01:14:08 Eastern Standard Time] read: ssh ["-oStrictHostKeyChecking=
+no","-n","-p","22","rlbrooks@celebdil.db48x.net","sh -c 'echo git-annex-probe lo
+ggedin;if which git-annex-shell; then echo git-annex-probe git-annex-shell; fi;i
+f which git; then echo git-annex-probe git; fi;if which rsync; then echo git-ann
+ex-probe rsync; fi;if which ~/.ssh/git-annex-shell; then echo git-annex-probe ~/
+.ssh/git-annex-shell; fi;cd '\"'\"'annex'\"'\"' && git config --list'"]
+rlbrooks@celebdil.db48x.net's password:
+[2013-12-31 01:15:03 Eastern Standard Time] read: gpg ["--quiet","--trust-model"
+,"always","--with-colons","--list-secret-keys","--fixed-list-mode"]
+gpg: WARNING: using insecure memory!
+gpg: please see http://www.gnupg.org/documentation/faqs.html for more informatio
+n
+gpg: fatal: can't create directory `/home/Familyroom/.gnupg': No such file or di
+rectory
+secmem usage: 0/0 bytes in 0/0 blocks of pool 0/65536
+"""]]
+
+Naturally, I don't have a /home/Familyroom, although I do have a /c/Users/Familyroom.
+
+### What steps will reproduce the problem?
+Start creating a remote repository.
+
+### What version of git-annex are you using? On what operating system?
+Windows 7, git-annex version 5.20131230-g192d991
diff --git a/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn b/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn
new file mode 100644
index 000000000..61aece482
--- /dev/null
+++ b/doc/bugs/webapp_takes_100__37___of_the_cpu.mdwn
@@ -0,0 +1,41 @@
+### Please describe the problem.
+
+I just started git-annex, and I can hear the fan of my CPU. That doesn't happen unless the CPU is maxed, and indeed:
+
+[[!format txt """
+top - 10:09:53 up 2 days, 13:13, 10 users,  load average: 2,49, 2,41, 1,59
+Tasks: 306 total,   3 running, 302 sleeping,   0 stopped,   1 zombie
+%Cpu(s): 57,2 us,  7,9 sy,  1,2 ni, 32,1 id,  1,3 wa,  0,0 hi,  0,3 si,  0,0 st
+KiB Mem:   8162960 total,  7480272 used,   682688 free,  1107616 buffers
+KiB Swap:  4022268 total,    23384 used,  3998884 free,  3469028 cached
+
+  PID USER      PR  NI  VIRT  RES  SHR S  %CPU %MEM    TIME+  COMMAND
+27841 anarcat   20   0  191m  45m  20m S  92,3  0,6   4:32.68 /usr/local/bin/git-annex webapp
+"""]]
+
+### What steps will reproduce the problem?
+
+I am not sure. I just started the webapp, and it seems to be scanning two huge repositories (160GB and 800GB) with lots of files. The larger one is also in the process of being sync'd to the backup drive.
+
+### What version of git-annex are you using? On what operating system?
+
+My usual bastard build from hell:
+
+[[!format txt """
+git-annex version: 5.20131109-gf2cb5b9
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP 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
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 5
+upgrade supported from repository versions: 0 1 2 4
+"""]]
+
+### Please provide any additional information below.
+
+Note that I had to close the chromium tab that was displaying the actual webapp UI, because that was taking another 50% of a CPU (I have a dual core).
+
+Note also that things calmed down since git-annex started transfering larger files - the webapp only takes 75% of the CPU now. ;) And chromium is negligible. But there clearly seems to be a degenerate case where a lot of small files get transfered that seem to freakout the web UI. -- [[anarcat]]
+
+Oh, and just copying the files using `git annex copy --to backup` doesn't use 100% of the CPU.
diff --git a/doc/design/external_special_remote_protocol/comment_5_3ee158e548002badae5bf44dc0442626._comment b/doc/design/external_special_remote_protocol/comment_5_3ee158e548002badae5bf44dc0442626._comment
new file mode 100644
index 000000000..fcc70a186
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_5_3ee158e548002badae5bf44dc0442626._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="TobiasTheViking"
+ subject="Feature requests"
+ date="2013-12-31T14:05:07Z"
+ content="""
+Hook should be able to set default configuration for itself.
+
+For instance, clean flickr hook will only upload some files(notably pictures). The user shouldn't have to manage that.
+
+Other hooks have a maximum filesize(though i guess that doesn't matter once splitting works).
+
+"""]]
diff --git a/doc/forum/Git_Annex_Sync_Delinks_Files.mdwn b/doc/forum/Git_Annex_Sync_Delinks_Files.mdwn
new file mode 100644
index 000000000..1ce18dd0b
--- /dev/null
+++ b/doc/forum/Git_Annex_Sync_Delinks_Files.mdwn
@@ -0,0 +1,11 @@
+So, I'm using git-annex to manage a group of external hard drives that I use to store a bunch of big files.
+
+When syncing tonight, though, it decided to take a whole subdirectory and replace the symlinks with the content directly when merging, or something.
+
+The remote side is not like that, and I didn't tell it to do anything like that.
+It just seems to feel like that's the thing to do, then it syncs and fails because suddenly git has many gigs of objects, which is what git-annex is supposed to solve.
+
+I've reset master a bunch of times, and it keeps choosing that path, but I don't know why.
+I've also reset master and synced/master a few times. I'm not fully sure what that one actually encodes, so I didn't want to touch it too much, but setting it to the same thing as master didn't seem to fix things either.
+
+Any idea why?
diff --git a/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names.mdwn b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names.mdwn
new file mode 100644
index 000000000..32fa7cb36
--- /dev/null
+++ b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names.mdwn
@@ -0,0 +1 @@
+I encounter crashing commits on files with special characters in their names, such as äöüáí etc. Is it not possible to sync such files?
diff --git a/doc/forum/partial_synchronisation._android_phone/comment_2_550ae91c8a1fe060368c4682d37514b6._comment b/doc/forum/partial_synchronisation._android_phone/comment_2_550ae91c8a1fe060368c4682d37514b6._comment
new file mode 100644
index 000000000..e549bf7cc
--- /dev/null
+++ b/doc/forum/partial_synchronisation._android_phone/comment_2_550ae91c8a1fe060368c4682d37514b6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE"
+ nickname="Łukasz"
+ subject="comment 2"
+ date="2013-12-30T22:13:15Z"
+ content="""
+thx for reply
+"""]]
diff --git a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn b/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn
index 1271e4444..f40b08324 100644
--- a/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn
+++ b/doc/forum/ssh__95__exchange__95__identification:_read:_Connection_reset_by_peer.mdwn
@@ -13,4 +13,16 @@ The webapp shows the remote repo as "unfinished repository".
 
 I can access the other computer via ssh and an other git-annex repo pairing between the two computers work fine.
 
+UPDATE: In the meantime I setup another paired repo on these two computers. Everything works fine. 
+
+I added the repos from scratch again and the same errors occurs again. The repositories which do not pair are the Documents folder on my desktop and on my macbook. Is there something special with macs documents folder?
+
+    [2013-12-31 10:53:23 CET] PushRetrier: Syncing with macbook.local_Documents 
+    fatal: 'macbook.local_Documents' does not appear to be a git repository
+    fatal: Could not read from remote repository.
+
+    Please make sure you have the correct access rights
+    and the repository exists.
+
+
 juh
diff --git a/doc/forum/what_happens_to_deleted_files__63__/comment_1_a476174646ad3adfbbe0cafdd7d42d08._comment b/doc/forum/what_happens_to_deleted_files__63__/comment_1_a476174646ad3adfbbe0cafdd7d42d08._comment
new file mode 100644
index 000000000..5959db535
--- /dev/null
+++ b/doc/forum/what_happens_to_deleted_files__63__/comment_1_a476174646ad3adfbbe0cafdd7d42d08._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://sameer.sbuddhe.net/blog/"
+ nickname="sameerds"
+ subject="never mind ..."
+ date="2013-12-31T04:06:43Z"
+ content="""
+... I discovered the [[`--all` option|http://git-annex.branchable.com/forum/Moving_older_version__39__s_file_content_without_doing_checkout/]] which does just what I was looking for!
+
+
+"""]]
diff --git a/doc/tips/finding_duplicate_files/comment_11_5efc6b6ee1dfec88512183e9679ca616._comment b/doc/tips/finding_duplicate_files/comment_11_5efc6b6ee1dfec88512183e9679ca616._comment
new file mode 100644
index 000000000..03ab1b3c7
--- /dev/null
+++ b/doc/tips/finding_duplicate_files/comment_11_5efc6b6ee1dfec88512183e9679ca616._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="sameerds"
+ ip="106.51.197.116"
+ subject="a shell script that handles spaces in file names"
+ date="2013-12-31T10:24:06Z"
+ content="""
+I used the following shell pipeline to remove duplicate files in one go:
+
+    (1) git annex find --format='${key}:${file}\n' \
+    (2)    | cut -d '-' -f 4- \
+    (3)    | sort \
+    (4)    | uniq --all-repeated=separate -w 40 \
+    (5)    | awk -vRS= -vFS='\n' '{for (i = 2; i <= NF; i++) print $i}' \
+    (6)    | cut -d ':' -f 2- \
+    (7)    | xargs -d '\n' git rm
+
+1. Generate a list of keys and file names separated by a colon (':').
+2. Cut out the initial part of the key so that the hash is at the beginning of the line. The `-f 4-` ensures that dashes in the filename do not result in truncation.
+3. Sort the entire list.
+4. Uniquify and print duplicates in groups separated by blank lines. Use the first 40 characters, which matches the length of a SHA1 hash. Other hashes will require a different length.
+5. Use awk to print all but the first line in each group. The empty `-vRS` sets blank line as the record separator, and the `-vFS` sets newline as the field separator. The for-loop prints each field except the first.
+6. Cut out the key and keep only the file name by relying on the colon introduced in the first step.
+7. Use xargs to separate file names by newline, which takes care of spaces in the file names. Send this list of arguments to `git rm`.
+"""]]
diff --git a/doc/users/sameerds.mdwn b/doc/users/sameerds.mdwn
new file mode 100644
index 000000000..6df5f181c
--- /dev/null
+++ b/doc/users/sameerds.mdwn
@@ -0,0 +1,3 @@
+Extremely grateful user of git-annex.
+
+[[http://sameer.sbuddhe.net/]]