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

3 files changed, 101 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_drops_files_from_remote_repos_that_it_shouldn__39__t/comment_8_fe2498f60b02104a8a044c79cb5bea63._comment b/doc/bugs/Assistant_drops_files_from_remote_repos_that_it_shouldn__39__t/comment_8_fe2498f60b02104a8a044c79cb5bea63._comment
new file mode 100644
index 000000000..2eec51026
--- /dev/null
+++ b/doc/bugs/Assistant_drops_files_from_remote_repos_that_it_shouldn__39__t/comment_8_fe2498f60b02104a8a044c79cb5bea63._comment
@@ -0,0 +1,66 @@
+[[!comment format=mdwn
+ username="etesial@f4797a6d725e971a2d41f3cbcf174991da178c29"
+ nickname="etesial"
+ subject="comment 8"
+ date="2015-07-07T14:45:32Z"
+ content="""
+Hi Joey, I've failed to reproduce it now on Debian's 5.20141105-g8d8b248 and have already deleted dirs from previous setup. Maybe I'll try again later if I get some ideas what to tune.
+
+This time I've written a script to setup repos for better reproducibility and while result is negative, I think it'll still may be useful to post it here:
+
+    #!/bin/bash
+
+    set -x
+    set -e
+
+    DIRS=(\"/home/butler/annex_test/data\"
+	\"/home/butler/annex_test/data\"
+	\"/home/butler/annex_test/data\")
+
+    NAMES=(\"antiferno\" \"axe\" \"deadbird\")
+
+    URIS=(\"ssh://antiferno//${DIRS[0]}\"
+	\"ssh://axe//${DIRS[1]}\"
+	\"ssh://deadbird//${DIRS[2]}\")
+
+    MODES=(\"manual\" \"backup\" \"manual\")
+
+
+    function init {
+	git init \"$1\"
+    }
+
+    function git_add_remote {
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" remote add \"$2\" \"$3\"
+    }
+
+    function annex_init {
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" annex init \"annex at $2\"
+    }
+
+    function annex_set_mode {
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" annex wanted . standard
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" annex group . \"$2\"
+    }
+
+    function add_initial_file {
+	path=\"$1/file_$2\"
+	echo \"File from $2\" >\"$path\"
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" annex add \"$path\"
+	git --git-dir=\"$1/.git\" --work-tree=\"$1\" commit -m \"First file on $2\"
+    }
+
+    function setup {
+	init \"${DIRS[$1]}\"
+	annex_init \"${DIRS[$1]}\" \"${NAMES[$1]}\"
+	git_add_remote \"${DIRS[$1]}\" \"${NAMES[$2]}\" \"${URIS[$2]}\"
+	git_add_remote \"${DIRS[$1]}\" \"${NAMES[$3]}\" \"${URIS[$3]}\"
+	annex_set_mode \"${DIRS[$1]}\" \"${MODES[$1]}\"
+	add_initial_file \"${DIRS[$1]}\" \"${NAMES[$1]}\"
+    }
+
+    if [ \"$1\" == \"${NAMES[0]}\" ]; then setup 0 1 2; fi
+    if [ \"$1\" == \"${NAMES[1]}\" ]; then setup 1 2 0; fi
+    if [ \"$1\" == \"${NAMES[2]}\" ]; then setup 2 0 1; fi
+
+"""]]
diff --git a/doc/bugs/git_annex_test_fails_when_run_through_powershell.mdwn b/doc/bugs/git_annex_test_fails_when_run_through_powershell.mdwn
new file mode 100644
index 000000000..48291b748
--- /dev/null
+++ b/doc/bugs/git_annex_test_fails_when_run_through_powershell.mdwn
@@ -0,0 +1,28 @@
+### Please describe the problem.
+
+When running "git annex test" in a Powershell window, two tests fail (listed in additional details). I am assuming it is because it is using powershell internal commands instead of msys utilities, at least in the case of the "mv" failure. Specifying "mv.exe" instead of just "mv" on Windows should work.
+
+### What steps will reproduce the problem?
+
+Run "git annex test" from the powershell prompt. Two tests fail. All tests pass when run through cmd.
+
+### What version of git-annex are you using? On what operating system?
+
+Windows 7 Enterprise SP1
+Powershell version 4.0
+git version 1.9.5.msysgit.1
+git annex I *think* is 5.20150617, but I don't know for sure.
+
+### 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
+
+addurl failed on file:///ws/wcs-project-new/.t/tmprepo5/myurl
+
+"mv": cannot move `C:\\Users\\duffrw\\LOCALS~1\\Temp\\importtest.0\\import1\\f' to `import1\\f12956.tmp'
+git-annex: MoveFileEx "C:\\Users\\duffrw\\LOCALS~1\\Temp\\importtest.0\\import1\\f" "import1\\f": unsupported operation (The system cannot move the file to a different disk drive.)
+
+# End of transcript or log.
+"""]]
diff --git a/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment b/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment
new file mode 100644
index 000000000..9feb93633
--- /dev/null
+++ b/doc/todo/__91__PATCH__93___Log.hs:_Add_missing_dash_to_--raw_option/comment_1_f56776e10b58547c3e8d3e55599a3fa9._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="sunny256"
+ subject="comment 1"
+ date="2015-07-06T22:33:48Z"
+ content="""
+Hehe, yep. ;) But it was quite low-hanging fruit anyway, and I'm glad it's fixed. Thanks. Hope you had a nice holiday, though. You deserve it. — Øyvind
+"""]]