code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 nickname="joey"
 subject="comment 7"
 date="2013-04-24T21:02:55Z"
 content="""
A few more changes got the rate down to 21 minutes per 10 thousand files. Estimate 3.5 hours for all.
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
 nickname="Laszlo"
 subject="Definite improvement"
 date="2013-05-03T06:27:12Z"
 content="""
Hi,

I have just tried it out again with the latest (20130501) version.

It is really nice to see you have been working on it, and it have improved tremendously!
The logging issue solved, and logrotates even, and it finished importing without crashing!

Remaining polishing things:

a)
The import time is not as good (as you write), it slowes itself down.
It is true the first 10000 files import in about an hour, but it finishes with everything
in 9 hours 20 minutes.
(on a normal laptop, the last 5000 file portion took more then 2 hours)

b)
Every startup means rechecksuming everything, so it means the second start took also around 8-12 hours.
(I don't know exactly because it finished somewhere during the night, but it was longer then 8 hours)
I don't think rechecksuming is necessary at all, if the filename, size and date have not modified,
then why rechecksuming (sha) it?

c)
It is leaking.
At the second startup, it reported it successfully added:
    Added 2375 files 5 files probe25366.txt

I have not touched the directory. ls confirms leaking:

    After first start (importing):
    annex_many/.git$ ls -lR |wc -l
    770199

    After second startup:
    annex_many/.git$ ls -lR |wc -l
    788351

d) Without ulimit raise, it does not work at all.
I think it could be solved by not watching each and every directory all the time.
Every users will likely have a working directory and some which he don't intend to touch/modify at all.
Some usecases: photo archiving, video archiving, finished work archiving, etc

All the above results with the stress test script.
I would love to have a confirmation by a thirdparty.

Overall I'm impressed with the work you have done.

Best,
 Laszlo

"""]]

repo_name: kakafarm/git

license: unknown


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
 nickname="Laszlo"
 subject="Maybe it is not leaking after all"
 date="2013-05-03T18:37:48Z"
 content="""
I have been working the whole day zipping up (tar.gz) all the unused directories.
Now my real data dir looks like this:

    ./annex_real/work_done$ du -hs .
    1,1G	.
    Has 9088 files and 1608 directories in total:
    ./annex_real/work_done$ ls -R1l |grep \\-r |wc -l
    9088
    ./annex_real/work_done$ ls -R1l |grep ^d |wc -l
    1608

When I first started git annex, it added 5492 files, then next time it added the missing 3596 files. Then it stopped adding files.
From the gui everything looked fine even at the first start (performed startup scan), even in the log files (daemon.log.x) was nothing suspicious.

    ./annex_real/work_done$ for i in ../.git/annex/daemon.log.*; do echo $i; cat $i |grep files; done
     ../.git/annex/daemon.log.1
     ../.git/annex/daemon.log.2
     ../.git/annex/daemon.log.3
     ../.git/annex/daemon.log.4
     [2013-05-03 20:03:34 CEST] Committer: Adding 3596 files
     ../.git/annex/daemon.log.5
     [2013-05-03 19:15:22 CEST] Committer: Adding 5492 files

As you can see, this case is not a stress test at all,
it is really the minimal test case, 1.1GB diskspace, 9088 files and a thousand dirs.
The real question is, why git-annex miss at the first startup 3492 files (ie. adding all the files).

It would help tremendously, if it would display at startup how many files he found,
and when it adds, then how many left to be added.
Something like this:

    (scanning...) [2013-05-03 20:03:14 CEST] Watcher: Performing startup scan
    (started...)
    [2013-05-03 20:03:34 CEST] Committer: Found 9088 files
    [2013-05-03 20:03:34 CEST] Committer: Adding 3596 files of 9088 remaining files (9088 in total)
    ....
    [2013-05-03 20:05:04 CEST] Committer: Adding 1492 files of 5492 remaining files (9088 in total)
    ....
    [2013-05-03 20:06:02 CEST] Committer: Adding 4000 files of 4000 remaining files (9088 in total)

So it is definietly a bug, and I stuck how to debug it further. Everything looks just fine.

Best,
 Laszlo

"""]]


code:
### Please describe the problem.
Symlinks get dereferenced.

### What steps will reproduce the problem?
Include a symlink in the repo.  Wait until another client syncs the repo.

### What version of git-annex are you using? On what operating system?
git-annex version: 5.20131117-gbd514dc

build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents 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: unknown

default repository version: 3

supported repository versions: 3 5

upgrade supported from repository versions: 0 1 2 4

### Please provide any additional information below.
I have a file `/Users/lhunath/annex/Library/Application Support/CrossOver/Bottles/Fallout 3/drive_c/users/crossover/My Documents` which is a symlink to `~/Documents` on the originating client. On the destination client, This turns into a directory, causing the whole content of `~/Documents` to get included in each bottle, which includes a bunch of VM images etc.....

> [[fixed|done]] --[[Joey]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8"
 nickname="Maarten"
 subject="workaround?"
 date="2013-12-05T14:17:57Z"
 content="""
Until this is fixed, how can I manually remove a file from git annex syncing?
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.87"
 subject="comment 2"
 date="2013-12-18T18:27:04Z"
 content="""
I don't quite understand how to reproduce this bug, and have tried a few things with symlinks and multiple syncing repositories without apparent difficulty.

Can you pleaseexplain in more detail how I could reproduce the problem?
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.87"
 subject="comment 3"
 date="2013-12-18T19:31:04Z"
 content="""
I see that you're using OSX. I have replicated the bug there, and fixed it. (I think.)
"""]]


code:
### Please describe the problem.

Since I last tested git-annex (version 4.20130516.1) my setup seems to no longer work in current versions (5.20131130)

### What steps will reproduce the problem?

[[!format sh """
$ mkdir 1 2
$ cd 1; git init; git-annex init; git annex direct; echo "file added to 1" > file_from_1; cd ..
Initialized empty Git repository in /home/pedrocr/testannexbug/1/.git/
init  ok
(Recording state in git...)
commit
# On branch master
#
# Initial commit
#
nothing to commit (create/copy files and use "git add" to track)
ok
direct  ok
$ cd 2; git init; git-annex init; git annex direct; echo "file added to 2" > file_from_2; cd ..
Initialized empty Git repository in /home/pedrocr/testannexbug/2/.git/
init  ok
(Recording state in git...)
commit
# On branch master
#
# Initial commit
#
nothing to commit (create/copy files and use "git add" to track)
ok
direct  ok
$ cd 1; git remote add 2 ssh://localhost/~pedrocr/Hacks/test-git-annex/2; git annex assistant; cd ..
$ cd 2; git remote add 1 ssh://localhost/~pedrocr/Hacks/test-git-annex/1; git annex assistant; cd ..
$ ls -la 1
total 20
drwxrwxr-x 3 pedrocr pedrocr 4096 Dec 15 11:33 .
drwxrwxr-x 4 pedrocr pedrocr 4096 Dec 15 11:33 ..
-rw-rw-r-- 1 pedrocr pedrocr   16 Dec 15 11:33 file_from_1
-rw-r--r-- 1 pedrocr pedrocr   16 Dec 15 11:33 file_from_2
drwxrwxr-x 9 pedrocr pedrocr 4096 Dec 15 11:33 .git
$ ls -la 2
total 20
drwxrwxr-x 3 pedrocr pedrocr 4096 Dec 15 11:33 .
drwxrwxr-x 4 pedrocr pedrocr 4096 Dec 15 11:33 ..
-rw-r--r-- 1 pedrocr pedrocr   16 Dec 15 11:33 file_from_1
-rw-rw-r-- 1 pedrocr pedrocr   16 Dec 15 11:33 file_from_2
drwxrwxr-x 9 pedrocr pedrocr 4096 Dec 15 11:33 .git
"""]]

so far so good

[[!format sh """
$ date | tee 1/file_from_1
Sun Dec 15 11:53:18 WET 2013
$ date | tee 2/file_from_2
Sun Dec 15 11:53:22 WET 2013
$ cat 1/*
Sun Dec 15 11:53:18 WET 2013
file added to 2
$ cat 2/*
file added to 1
Sun Dec 15 11:53:22 WET 2013
$
"""]]

But then syncing doesn't work. There doesn't seem to be anything special in the logs

[[!format sh """
$ tail -n 20 1/.git/annex/daemon.log
(Recording state in git...)
add file_from_1 (checksum...) [2013-12-15 11:53:18 WET] Committer: Committing changes to git
[2013-12-15 11:53:18 WET] Pusher: Syncing with 2

file_from_1
          29 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)

sent 104 bytes  received 31 bytes  270.00 bytes/sec
total size is 29  speedup is 0.21
[2013-12-15 11:53:18 WET] Transferrer: Uploaded file_from_1
Already up-to-date.
To ssh://localhost/~pedrocr/Hacks/test-git-annex/2
   f025062..431ac37  git-annex -> synced/git-annex
   d393bb3..fef60ca  annex/direct/master -> synced/master
Already up-to-date.
[2013-12-15 11:53:21 WET] Pusher: Syncing with 2
To ssh://localhost/~pedrocr/Hacks/test-git-annex/2
   431ac37..3cc7045  git-annex -> synced/git-annex

$ tail -n 20 2/.git/annex/daemon.log
(Recording state in git...)
add file_from_2 (checksum...) [2013-12-15 11:53:22 WET] Committer: Committing changes to git
[2013-12-15 11:53:22 WET] Pusher: Syncing with 1

file_from_2
          29 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
Already up-to-date.

sent 104 bytes  received 31 bytes  270.00 bytes/sec
total size is 29  speedup is 0.21
[2013-12-15 11:53:22 WET] Transferrer: Uploaded file_from_2
To ssh://localhost/~pedrocr/Hacks/test-git-annex/1
   ebbcd4c..dae7a77  git-annex -> synced/git-annex
   ffd5a90..67ad7c1  annex/direct/master -> synced/master
Already up-to-date.
[2013-12-15 11:53:25 WET] Pusher: Syncing with 1
To ssh://localhost/~pedrocr/Hacks/test-git-annex/1
   dae7a77..976c899  git-annex -> synced/git-annex
"""]]

### What version of git-annex are you using? On what operating system?

I'm running git-annex from the Ubuntu PPA on Ubuntu 12.04 LTS.

[[!format sh """
$ lsb_release -v
No LSB modules are available.
$ lsb_release -a
No LSB modules are available.
Distributor ID:	Ubuntu
Description:	Ubuntu 12.04.3 LTS
Release:	12.04
Codename:	precise
$ git annex version
git-annex version: 5.20131130
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
"""]]

> [[!taglink moreinfo]] needed. --[[Joey]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.87"
 subject="comment 1"
 date="2013-12-16T20:48:12Z"
 content="""
Sounds to me like it could be a messed up direct mode mapping file due to bugs in version 4.20130516. But I am not sure I follow your transcript; you don't seem to show how things looked when it went wrong. If it was the mapping, `git annex fsck` would correct the problem.
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY"
 nickname="Pedro"
 subject="comment 2"
 date="2013-12-16T23:00:48Z"
 content="""
What my transcript shows is that after the initial sync 1 doesn't get the changes from 2 and vice versa. This test is from scratch so it can't be something related to the old version. I'll try the fsck on my other machines to see if it fixes the issues there.
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.146"
 subject="comment 3"
 date="2014-03-07T17:21:02Z"
 content="""
Any news on this? Does it happen with the current version?

"""]]


code:
### 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]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
 nickname="Justin"
 subject="This test is still failing on Windows"
 date="2014-01-29T14:37:33Z"
 content="""
This 1 test is still failing for me on Windows 7 Pro with the latest release (git-annex version: 5.20140128-gddb2083).

I also followed the manual steps provided in the initial bug report.  This resulted in two cloned repos which appeared to have resolved the conflict differently.  Upon further investigation, I see that the conflict was in fact resolved consistently, just that the file sizes in the working directories are different because the file contents has not been synced (so some files contain the \"symlink\" path rather than the actual contents).

After running a sync in both repositories with the new --contents option, the two working directories appear to be resolved consistently.
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.199"
 subject="comment 2"
 date="2014-01-29T17:52:27Z"
 content="""
AFAICS, the test suite does not look at the contents of the files when testing this. Anyway, you said a lot about how it works when you try to reproduce the bug manually, but you didn't actually show how the test suite is failing.
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
 nickname="Justin"
 subject="comment 3"
 date="2014-01-29T18:43:07Z"
 content="""
Here is the relevant portion of the test output.  Sorry for getting caught up in my manual troubleshooting and not providing this info earlier.

        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
    ok
    push origin
    Counting objects: 21, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (13/13), done.
    Writing objects: 100% (16/16), 1.62 KiB | 0 bytes/s, done.
    Total 16 (delta 2), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       5a1abd2..b0de6d7  git-annex -> synced/git-annex
       4539cc8..af0b4de  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
    remote: Counting objects: 21, done.
    remote: Compressing objects: 100% (13/13), done.
    remote: Total 16 (delta 2), reused 0 (delta 0)
    Unpacking objects: 100% (16/16), done.
    From c:/Users/geibeljt/annex/.t\repo
       4539cc8..af0b4de  master     -> origin/master
       5a1abd2..b0de6d7  synced/git-annex -> origin/synced/git-annex
       4539cc8..af0b4de  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.
    (Recording state in git...)
    conflictor: needs merge
    [annex/direct/master 7b21326] git-annex automatic merge conflict fix

      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
    Counting objects: 32, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (19/19), done.
    Writing objects: 100% (23/23), 2.18 KiB | 0 bytes/s, done.
    Total 23 (delta 7), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       b0de6d7..b64838f  git-annex -> synced/git-annex
       af0b4de..7b21326  annex/direct/master -> synced/master
    ok
    commit  ok
    pull r2
    remote: Counting objects: 32, done.
    remote: Compressing objects: 100% (19/19), done.
    remote: Total 23 (delta 7), reused 0 (delta 0)
    Unpacking objects: 100% (23/23), done.
    From ../../.t\tmprepo36
     * [new branch]      annex/direct/master -> r2/annex/direct/master
     * [new branch]      git-annex  -> r2/git-annex
     * [new branch]      master     -> r2/master
     * [new branch]      synced/master -> r2/synced/master

    Updating af0b4de..7b21326
    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...)
      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

    Adding conflictor/subfile
    CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/synced/master. Add
    ing conflictor as conflictor~HEAD
    Automatic merge failed; fix conflicts and then commit the result.
    conflictor: needs merge

    git-annex: c:\Users\geibeljt\annex\.t\tmprepo37\.git\annex\merge\conflictor: renameFile: inappropriate type (i
    s a directory)
    failed
    push origin
    Counting objects: 29, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (15/15), done.
    Writing objects: 100% (19/19), 1.71 KiB | 0 bytes/s, done.
    Total 19 (delta 5), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       b64838f..0c094c8  git-annex -> synced/git-annex
     ! [rejected]        annex/direct/master -> synced/master (non-fast-forward)
    error: failed to push some refs to 'c:/Users/geibeljt/annex/.t\repo'
    hint: Updates were rejected because a pushed branch tip is behind its remote
    hint: counterpart. Check out this branch and integrate the remote changes
    hint: (e.g. 'git pull ...') before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.

      Pushing to origin failed.

      (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git
     config)
    failed
    git-annex: sync: 2 failed
    FAIL
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.199"
 subject="comment 4"
 date="2014-01-29T19:48:51Z"
 content="""
Ok, what's happening is that code path calls System.PosixCompat.Files.rename, and on unix that maps to regular rename() which can rename files or directories, but on windows, it's a compatability stub that calls haskell's renameFile, which oddly refuses to rename directories.

I remember testing my fix to the parent bug originally, but I don't know how. Possibly I changed something afterwards that exposed this new problem.

Need to use System.Win32.File.moveFile, which actually can move directories too. Made this change in git, and you can download an windows autobuild of it already if you'd like.
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
 nickname="Justin"
 subject="comment 5"
 date="2014-01-29T20:26:15Z"
 content="""
This seems to have affected a lot of tests, I'm now getting \"20 out of 72 tests failed\".  In particular, error messages similar to the following show up now in many tests (with different paths for each test).

    git-annex: MoveFile \"c:\\Users\\geibeljt\\annex\\.t\\tmprepo36\\.git\\annex\\objects\\574\\4ca\\SHA256E-s7--6f
    e7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7\\SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d596
    64989c3b1e80a980bac1cb352a2ba7.map25112.tmp\" \"c:\\Users\\geibeljt\\annex\\.t\\tmprepo36\\.git\\annex\\objects\
    \574\\4ca\\SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7\\SHA256E-s7--6fe7bd6dc
    d1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7.map\": already exists (Cannot create a file when that f
    ile already exists.)

---
And here is the full output for the test that was originally failing.  It now appears to fail much earlier than before.

        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
    ok
    push origin
    Counting objects: 21, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (13/13), done.
    Writing objects: 100% (16/16), 1.57 KiB | 0 bytes/s, done.
    Total 16 (delta 3), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       a462941..43dcc49  git-annex -> synced/git-annex
       8268d47..3012c35  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
    git-annex: MoveFile \"c:\\Users\\geibeljt\\annex\\.t\\tmprepo36\\.git\\annex\\objects\\574\\4ca\\SHA256E-s7--6f
    e7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7\\SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d596
    64989c3b1e80a980bac1cb352a2ba7.map25112.tmp\" \"c:\\Users\\geibeljt\\annex\\.t\\tmprepo36\\.git\\annex\\objects\
    \574\\4ca\\SHA256E-s7--6fe7bd6dcd1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7\\SHA256E-s7--6fe7bd6dc
    d1d46cfa98027c64f1e51d59664989c3b1e80a980bac1cb352a2ba7.map\": already exists (Cannot create a file when that f
    ile already exists.)
    failed
    pull origin
    remote: Counting objects: 21, done.
    remote: Compressing objects: 100% (13/13), done.
    remote: Total 16 (delta 3), reused 0 (delta 0)
    Unpacking objects: 100% (16/16), done.
    From c:/Users/geibeljt/annex/.t\repo
       8268d47..3012c35  master     -> origin/master
       a462941..43dcc49  synced/git-annex -> origin/synced/git-annex
       8268d47..3012c35  synced/master -> origin/synced/master

    Updating 8268d47..3012c35
    Fast-forward
     conflictor | 1 +
     1 file changed, 1 insertion(+)
     create mode 120000 conflictor
    ok
    (merging origin/synced/git-annex into git-annex...)
    (Recording state in git...)
    push origin
    Counting objects: 24, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (13/13), done.
    Writing objects: 100% (16/16), 1.42 KiB | 0 bytes/s, done.
    Total 16 (delta 6), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       43dcc49..c040cd6  git-annex -> synced/git-annex
    ok
    git-annex: sync: 1 failed
    FAIL
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.199"
 subject="comment 6"
 date="2014-01-29T21:24:34Z"
 content="""
I missed that moveFile refuses to overwrite existing files. This is fixed in git, and the autobuild is updating.
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
 nickname="Justin"
 subject="comment 7"
 date="2014-01-30T16:02:08Z"
 content="""
Alright, I've grabbed the latest autobuild and have tested again with 5.20140130-gcb99900.  Back to failing just this one test case.  Compared to my last two comments, the test appears to be getting further along before failing.

        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
    ok
    push origin
    Counting objects: 21, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (13/13), done.
    Writing objects: 100% (16/16), 1.66 KiB | 0 bytes/s, done.
    Total 16 (delta 1), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       dafdb0b..2d106aa  git-annex -> synced/git-annex
       688224a..18c2edb  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
    remote: Counting objects: 21, done.
    remote: Compressing objects: 100% (13/13), done.
    remote: Total 16 (delta 1), reused 0 (delta 0)
    Unpacking objects: 100% (16/16), done.
    From c:/Users/geibeljt/annex/.t\repo
       688224a..18c2edb  master     -> origin/master
       dafdb0b..2d106aa  synced/git-annex -> origin/synced/git-annex
       688224a..18c2edb  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.
    (Recording state in git...)
    conflictor: needs merge
    [annex/direct/master 5026450] git-annex automatic merge conflict fix

      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
    Counting objects: 32, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (19/19), done.
    Writing objects: 100% (23/23), 2.18 KiB | 0 bytes/s, done.
    Total 23 (delta 7), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       2d106aa..aca0d04  git-annex -> synced/git-annex
       18c2edb..5026450  annex/direct/master -> synced/master
    ok
    commit  ok
    pull r2
    remote: Counting objects: 32, done.
    remote: Compressing objects: 100% (19/19), done.
    remote: Total 23 (delta 7), reused 0 (delta 0)
    Unpacking objects: 100% (23/23), done.
    From ../../.t\tmprepo36
     * [new branch]      annex/direct/master -> r2/annex/direct/master
     * [new branch]      git-annex  -> r2/git-annex
     * [new branch]      master     -> r2/master
     * [new branch]      synced/master -> r2/synced/master

    Updating 18c2edb..5026450
    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...)
      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

    Adding conflictor/subfile
    CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/synced/master. Add
    ing conflictor as conflictor~HEAD
    Automatic merge failed; fix conflicts and then commit the result.
    conflictor: needs merge
    (Recording state in git...)
    [annex/direct/master 82abd2f] git-annex automatic merge conflict fix

      Merge conflict was automatically resolved; you may want to examine the result.
    ok
    push origin
    Counting objects: 32, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (17/17), done.
    Writing objects: 100% (22/22), 1.95 KiB | 0 bytes/s, done.
    Total 22 (delta 7), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       aca0d04..9d475c9  git-annex -> synced/git-annex
       5026450..82abd2f  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
    remote: Counting objects: 32, done.
    remote: Compressing objects: 100% (17/17), done.
    remote: Total 22 (delta 7), reused 0 (delta 0)
    Unpacking objects: 100% (22/22), done.
    From c:/Users/geibeljt/annex/.t\repo
       5026450..82abd2f  master     -> origin/master
       aca0d04..9d475c9  synced/git-annex -> origin/synced/git-annex
       5026450..82abd2f  synced/master -> origin/synced/master

    Auto-merging conflictor/subfile
    CONFLICT (add/add): Merge conflict in conflictor/subfile
    Automatic merge failed; fix conflicts and then commit the result.
    failed
    (merging origin/synced/git-annex into git-annex...)
    (Recording state in git...)
    push origin
    Counting objects: 34, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (17/17), done.
    Writing objects: 100% (22/22), 2.05 KiB | 0 bytes/s, done.
    Total 22 (delta 5), reused 0 (delta 0)
    To c:/Users/geibeljt/annex/.t\repo
       9d475c9..13a0faa  git-annex -> synced/git-annex
     ! [rejected]        annex/direct/master -> synced/master (non-fast-forward)
    error: failed to push some refs to 'c:/Users/geibeljt/annex/.t\repo'
    hint: Updates were rejected because a pushed branch tip is behind its remote
    hint: counterpart. Check out this branch and integrate the remote changes
    hint: (e.g. 'git pull ...') before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.

      Pushing to origin failed.

      (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git
     config)
    failed
    git-annex: sync: 2 failed
    FAIL
"""]]


code:
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
 nickname="Justin"
 subject="comment 8"
 date="2014-02-04T02:05:36Z"
 content="""
With the changes pushed today, I confirm I also have all 72 tests passing on Windows 7 with 5.20140203-g83e6fb7.

Thanks!
"""]]


code:
I only saw this just now, but the tests fail to link/build on OSX

<pre>
[181 of 181] Compiling Main ( git-annex.hs, tmp/Main.o )
Linking git-annex ...
+ make -q test
+ '[' 1 = 1 ']'
+ ../maxtime 1800 make test
[175 of 175] Compiling Main ( test.hs, tmp/Main.o )
test.hs:175:17:
Not in scope: data constructor `Types.Backend.KeySource'
test.hs:175:43:
`Types.Backend.keyFilename' is not a (visible) constructor field name
test.hs:175:76:
`Types.Backend.contentLocation' is not a (visible) constructor field name
** failed to build the test suite
make: *** [test] Error 1
+ exit 4
</pre>

this issue seems to got introduced at commit e0fdfb2e706da2cb1451193c658dc676b0530968

> [[fixed|done]] --[[Joey]]


code:
### Please describe the problem.
git-annex assistant reports a warning:
TransferScanner crashed: fd:59: hGetLine: end of file

### What steps will reproduce the problem?
I don't know. Just run git-annex assistant and wait for this to happen.

### What version of git-annex are you using? On what operating system?
Version: 5.20140709
Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash

Gentoo

### Please provide any additional information below.

[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
error: object file /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f is empty
fatal: loose object 973b57761ebe88b11e1d0d2c70c8d3b48530202f (stored in /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f) is corrupt
error: object file /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f is empty
fatal: loose object 973b57761ebe88b11e1d0d2c70c8d3b48530202f (stored in /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f) is corrupt
error: object file /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f is empty
fatal: loose object 973b57761ebe88b11e1d0d2c70c8d3b48530202f (stored in /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f) is corrupt
error: object file /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f is empty
fatal: loose object 973b57761ebe88b11e1d0d2c70c8d3b48530202f (stored in /home/crabman/annex/.git/objects/97/3b57761ebe88b11e1d0d2c70c8d3b48530202f) is corrupt
fd:31: hGetLine: end of file
fd:32: hGetLine: end of file
fd:33: hGetLine: end of file
fd:34: hGetLine: end of file
fd:38: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:43: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:41: hGetLine: end of file
fd:43: hGetLine: end of file

# End of transcript or log.
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.2"
 subject="comment 1"
 date="2014-07-14T18:47:21Z"
 content="""
You did not seem to paste the whole log, but it's clear that your git repository is corrupt. You might try running `git annex repair` inside it.

This was probably caused by a disk corruption or if you're lucky just a hard shutdown that caused files to get truncated.

The assistant tries to detect corrupt repositories on startup, but it's hard to detect when a repository has a few corrupt objects like this. This is why the webapp suggests you set up periodic repository consistency checks, which should eventually repair this kind of problem.

Perhaps it would make sense for the webapp, when a thread crashes, to provide a button to run an consistency check immediately.
"""]]


code:
[[!comment format=mdwn
 username="jg123h12jh3y12g3y"
 ip="86.62.100.131"
 subject="comment 2"
 date="2014-07-15T07:58:15Z"
 content="""
But I do have periodice consistency checks turned on. I think git-annex assistant should tell the user what the heck is going on and maybe try to repair it automatically.
"""]]


code:
After creating a new pairing, I stopped the daemon through the webapp while it was syncing.  The webapp shut down and was no longer accessible, but git-annex continued running in the background, along with git-annex-shell, and they continued to run new transfers with new rsync processes.  This continued until I killed them all.

I expected that when I stopped the daemon in the webapp, all git-annex processes and all transfers would stop.

Using the 20131101 tarball.


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.47"
 subject="comment 1"
 date="2013-11-05T16:01:14Z"
 content="""
I've checked, and shutting down the daemon does cause it to stop any transfers it is running.

However, this does not stop other transfers initiated by the other paired computer.

I'm ambivilant about whether local pairing should only allow transfers when both daemons are running.
"""]]


code:
What steps will reproduce the problem?

I added a (encrypted) ssh remote and everything worked fine. Now I marked the remote as dead, but git-annex still tries to upload to this remote. I recognize this because it asks for my ssh and gpg keys passwords.

While transfering (or asking for the password), `git annex status` shows the following:
<pre>
supported backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
supported remote types: git S3 bup directory rsync web hook
trusted repositories: 0
semitrusted repositories: 2
	00000000-0000-0000-0000-000000000001 -- web
 	cd16b9c6-f464-11e1-9845-8749687232d2 -- here (Dell)
untrusted repositories: 0
dead repositories: 7
	11379fa0-ecd6-49e2-9bec-24fc19cc7b9f -- vserver.dbruhn.de_annex
 	2195e036-d2ef-4357-8c89-a9aaec23ebdc -- vserver-plain
 	4d066ea1-fb9f-45fd-990a-5c5c836f530e -- inTmp
 	bb276045-6ba6-488f-88d0-39a3c5f5134d -- vserver-enc
 	c49f3372-3fcf-49fc-b626-73ba4454c172 -- annexBare (bareAnnex)
 	e52645b3-bfb6-457d-b281-967353919e29 -- AnnexUSBFAT
 	ea3d6acc-716c-48e8-9b6b-993b90dcc1db -- vserver2
transfers in progress:
	uploading Schmidt/somefile.m4a

 to vserver2
available local disk space: 43 gigabytes (+1 megabyte reserved)
temporary directory size: 389 megabytes (clean up with git-annex unused)
local annex keys: 23
local annex size: 396 megabytes
known annex keys: 19
known annex size: 396 megabytes
bloom filter size: 16 mebibytes (0% full)
backend usage:
	SHA256E: 42
</pre>

As you can see, the `vserver2` remote is marked as dead but git-annex still tries to upload. This problem keeps occuring even after restarts.

What is the expected output? What do you see instead?

If I do not get the `dead` status wrong, git-annex should not use these remotes.

What version of git-annex are you using? On what operating system?

git-annex HEAD from yesterdays git. Ubuntu 12.10

Please provide any additional information below.

[[!tag /design/assistant moreinfo]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="4.152.108.194"
 subject="comment 1"
 date="2012-11-04T20:01:35Z"
 content="""
Are you using the git-annex assistant? It's supposed to have code in it to prevent it from using dead remotes. Perhaps that is not working.

When not using the git-annex assistant, nothing prevents git-annex from trying to continue to use dead remotes. I think this is ok; maybe the dead remote is not 100% dead yet; if it is, the remote can be removed from git's configuration to prevent it being used of course.
"""]]


code:
[[!comment format=mdwn
 username="http://www.dbruhn.de/"
 nickname="Dominik"
 subject="comment 2"
 date="2012-11-08T14:13:00Z"
 content="""
Actually this happens when using the assistant.
"""]]


code:
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="4.252.11.120"
 subject="comment 3"
 date="2012-11-13T18:00:42Z"
 content="""
I've tried & failed to reproduce this using the assistant. When I mark a repo as dead, and go into Configuration -> Manage repositories, the repository is not shown in the list of repositories it'll sync to, and it certainly doesn't upload any files to it.

"""]]