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

6 files changed, 108 insertions, 0 deletions

diff --git a/doc/bugs/Cannot_copy_to_a_git-annex_remote/comment_10_d9b830a1fdea8760cb7da1d36b3cd34d._comment b/doc/bugs/Cannot_copy_to_a_git-annex_remote/comment_10_d9b830a1fdea8760cb7da1d36b3cd34d._comment
new file mode 100644
index 000000000..5fb3fe8ea
--- /dev/null
+++ b/doc/bugs/Cannot_copy_to_a_git-annex_remote/comment_10_d9b830a1fdea8760cb7da1d36b3cd34d._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck"
+ nickname="Jim"
+ subject="Same bug"
+ date="2013-03-19T13:59:32Z"
+ content="""
+Hi,
+
+This looks like the exact same issue as [get failed, but remote has the file](http://git-annex.branchable.com/bugs/get_failed__44___but_remote_has_the_file/).
+I can reproduce your problem here by doing a `git annex copy --to bucket bigfile.gz`, then stopping that transfer with `^Z`, and finally running the `copy` command
+again.  It will fail with the same debug output as you show here.
+"""]]
diff --git a/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment b/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment
new file mode 100644
index 000000000..fe25b98e6
--- /dev/null
+++ b/doc/bugs/WEBDAV_443/comment_18_b4f894a0b9ebb84ab73f6ffcf0778090._comment
@@ -0,0 +1,29 @@
+[[!comment format=mdwn
+ username="https://pradermecker.myopenid.com/"
+ ip="195.244.162.7"
+ subject="It works !"
+ date="2013-03-19T10:40:31Z"
+ content="""
+Sorry for the wild tangents.
+
+It is now working. I am not sure what went wrong.
+
+For the record here are the steps I took (all using the Git annex UI):
+
+* Set up removable media -> OK
+* Set up remote SSH -> missing lsof -> install it -> everything OK
+* Set up S3  -> had issue with time -> solve it with ntp -> everything OK
+* Try again WebDav -> \"Conflict\" message -> try using another dir -> everything OK
+
+There might be a \"cleanup after error problem\" somewhere that would explain the conflict message I have received.
+
+Again for the record, I made it works inside a VM using the AUR \"git-annex 4.20130314-1\" (not the standalone). The only change I made on the PKGBUILD was to install everything with cabal except for the packages in the [haskell-core] Arch repo. I know you are not aware with Arch but basically I choose not to rely on the [haskell-web] Arch repo.
+
+I will try again at home on my laptop and I will try the standalone as well.
+
+Thanks you so much for the wonderful product !
+
+Cheers
+
+
+"""]]
diff --git a/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn b/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn
new file mode 100644
index 000000000..4e0a67d62
--- /dev/null
+++ b/doc/bugs/cannot_add_file__44___get___34__user_error__34__.mdwn
@@ -0,0 +1,28 @@
+What steps will reproduce the problem?
+
+I can reproduce it locally:
+
+    % annex -d add Eigene\ Bilder/
+    [2013-03-19 15:44:01 CET] read: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","ls-files","--others","--exclude-standard","-z","--","Eigene Bilder/"]
+    [2013-03-19 15:44:01 CET] read: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","diff","--name-only","--diff-filter=T","-z","--","Eigene Bilder/"]
+    add Eigene Bilder/20070311/Bild023.jpg [2013-03-19 15:44:01 CET] chat: git ["--git-dir=/Users/fschulze/Bilder/.git","--work-tree=/Users/fschulze/Bilder","check-attr","-z","--    stdin","annex.backend","annex.numcopies","--"]
+    (checksum...) [2013-03-19 15:44:01 CET] read: sha512sum ["/Users/fschulze/Bilder/.git/annex/tmp/Bild02366551.jpg"]
+
+git-annex: user error (sha512sum ["/Users/fschulze/Bilder/.git/annex/tmp/Bild02366551.jpg"] exited 127)
+failed
+
+What is the expected output? What do you see instead?
+
+The file isn't added.
+
+What version of git-annex are you using? On what operating system?
+
+OS X from dmg
+
+    git-annex version: 4.20130314
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3 4
+    upgrade supported from repository versions: 0 1 2
+    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS
+
diff --git a/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_1_14aa717c1befcbbf526f25ca2f0af825._comment b/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_1_14aa717c1befcbbf526f25ca2f0af825._comment
new file mode 100644
index 000000000..87855ab4b
--- /dev/null
+++ b/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_1_14aa717c1befcbbf526f25ca2f0af825._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-03-19T17:19:32Z"
+ content="""
+What version of OSX is this? From what url did you download the dmg? 
+
+Have you run \"runshell\" to get the shell you're using git-annex in?
+
+What happens if you run sha512sum on the file yourself?
+
+The SHA512 backend is not the default backend used by git-annex. Is the default SHA256 backend working?
+"""]]
diff --git a/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_2_7f7ac59e7f3dce9d7a7d0c3379c2edcf._comment b/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_2_7f7ac59e7f3dce9d7a7d0c3379c2edcf._comment
new file mode 100644
index 000000000..0e9b034c0
--- /dev/null
+++ b/doc/bugs/cannot_add_file__44___get___34__user_error__34__/comment_2_7f7ac59e7f3dce9d7a7d0c3379c2edcf._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawla3gLc6_rHuggFfy7o7eGMPvPztFZTrUQ"
+ nickname="Florian"
+ subject="comment 2"
+ date="2013-03-19T17:42:00Z"
+ content="""
+OS X Lion 10.7.5
+http://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg.bz2
+
+What is \"runshell\"? I used the binary from inside the app, maybe that's the issue? How am I supposed to use it from the command line? I had used a 2012 version installed via cabal before, but upgrading it didn't work anymore. I got lot's of errors from various cabal packages when I tried.
+
+Directly it seems to work fine:
+
+% ~/Applications/git-annex.app/Contents/MacOS/sha512sum Eigene\ Bilder/20070311/Bild023.jpg
+96d61ed877bcd5c9b5935aca77a1eae78bcb577d5c7aa049b247861bbcd4122ff3c2280ea6dc6152bc843e73c006281614c28d14bdd70aa1692f948e8f19bf4c  Eigene Bilder/20070311/Bild023.jpg
+
+I'm actually using SHA512E. I will try later to reproduce with just that file in another repository. Is there anything else I can provide?
+"""]]
diff --git a/doc/forum/Local_and_remote_in_direct_mode.mdwn b/doc/forum/Local_and_remote_in_direct_mode.mdwn
new file mode 100644
index 000000000..128d8eab6
--- /dev/null
+++ b/doc/forum/Local_and_remote_in_direct_mode.mdwn
@@ -0,0 +1,7 @@
+I have two machines (A and B ) both have a directory called "inbox"
+I want to sync these two directories. So I ran git annex assistant on machine A and set up a remote to B with **ssh** and selected **client: a repository on your computer**.
+
+The end result is that I have something that looks like a git bare repo on machine B and I have no files on A from machine B.
+
+What am I doing wrong? What shall I do to achieve my goal?
+It is kind of dropbox functionality what I want. (Which I never used for security/policy reasons.)