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

2 files changed, 75 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_merge_loop/comment_1_ccf46511b924f86b488dba25060baa06._comment b/doc/bugs/Assistant_merge_loop/comment_1_ccf46511b924f86b488dba25060baa06._comment
new file mode 100644
index 000000000..c5f9c2187
--- /dev/null
+++ b/doc/bugs/Assistant_merge_loop/comment_1_ccf46511b924f86b488dba25060baa06._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.55"
+ subject="comment 1"
+ date="2014-07-05T20:34:39Z"
+ content="""
+I am seeing some evidence of this in my own family's repo, where one node updated to 5.20140613 and started making series of empty commits with message \"merge refs/heads/synced/master\" and only 1 parent (so not really a merge).
+
+Quite likely [[!commit d6711800ad261fb4c37fc361bc84918d1e296bc4]] is at fault. Probably the fastForwardable check isn't quite right.
+
+This should only affect direct mode repositories. When only one node has the problem, it won't be bad, but if multiple nodes are doing this, their repos never converge and keep growing.
+
+Hmm, I think I have partially reproduced it with 2 direct mode repos, each having the other as a remote. `git annex sync` repeatedly in each does not add unncessary commits, but running the assistant in each does. In this particular case, it manages to converge eventually after several commits.
+"""]]
diff --git a/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn b/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn
new file mode 100644
index 000000000..e68f6610a
--- /dev/null
+++ b/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn
@@ -0,0 +1,61 @@
+### Please describe the problem.
+
+I get no such file errors when using WORM backend on files with a certain name. Doesn't like brackets?
+
+Default backend is fine (see output below).
+
+### What steps will reproduce the problem?
+
+See additional info
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version: 5.20140613-g5587055
+On Windows 8.1
+Tried with both Windows command prompt and Git Bash shell.
+
+### 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
+
+git config --add annex.backends WORM
+git annex add extras
+
+add extras/Extra Content - Reason Drum Takes/DT Key Map.pdf ok
+add extras/Extra Content - Reason Drum Takes/DT Read Me.pdf ok
+add extras/Extra Content - Reason Drum Takes/DT7 Rock - Love  (136).reason ok
+add extras/Extra Content - Reason Drum Takes/DT7 Rock - Peace  (200).reason ok
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G06.aif
+git-annex: C:\Studio\.git\annex\objects\b43\d6d\WORM-s178174-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S
+amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G06.aif\WORM-s178174-m1363015489--extras%Extra Content - Reason Drum Tak
+es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G06.aif.cache: openFile: does not exist (No such file or directo
+ry)
+failed
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G09.aif
+git-annex: C:\Studio\.git\annex\objects\e90\b5c\WORM-s199108-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S
+amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G09.aif\WORM-s199108-m1363015489--extras%Extra Content - Reason Drum Tak
+es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G09.aif.cache: openFile: does not exist (No such file or directo
+ry)
+failed
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G14.aif
+git-annex: C:\Studio\.git\annex\objects\995\4e7\WORM-s201570-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S
+amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G14.aif\WORM-s201570-m1363015489--extras%Extra Content - Reason Drum Tak
+es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G14.aif.cache: openFile: does not exist (No such file or directo
+ry)
+failed
+
+git config --unset annex.backends
+git annex add extras
+
+add extras/Extra Content - Reason Drum Takes/DT Key Map.pdf ok
+add extras/Extra Content - Reason Drum Takes/DT Read Me.pdf ok
+add extras/Extra Content - Reason Drum Takes/DT7 Rock - Love  (136).reason ok
+add extras/Extra Content - Reason Drum Takes/DT7 Rock - Peace  (200).reason ok
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G06.aif ok
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G09.aif ok
+add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G14.aif ok
+
+# End of transcript or log.
+"""]]