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

4 files changed, 62 insertions, 0 deletions

diff --git a/doc/bugs/Crash_when_adding_jabber_account_/comment_4_716ac138cb69eecd0fb586699b4aeb2a._comment b/doc/bugs/Crash_when_adding_jabber_account_/comment_4_716ac138cb69eecd0fb586699b4aeb2a._comment
new file mode 100644
index 000000000..9039faca5
--- /dev/null
+++ b/doc/bugs/Crash_when_adding_jabber_account_/comment_4_716ac138cb69eecd0fb586699b4aeb2a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8"
+ nickname="Johannes"
+ subject="signal 11"
+ date="2013-04-03T15:13:05Z"
+ content="""
+I'm getting a \"error: git-annex died of signal 11\" when trying to add a self-hosted jabber account. I'm using ejabberd and a self-signed SSL certificate.
+"""]]
diff --git a/doc/bugs/allows_repository_with_the_same_name_twice.mdwn b/doc/bugs/allows_repository_with_the_same_name_twice.mdwn
new file mode 100644
index 000000000..91a31f3f0
--- /dev/null
+++ b/doc/bugs/allows_repository_with_the_same_name_twice.mdwn
@@ -0,0 +1,23 @@
+What steps will reproduce the problem?
+
+Unsure. I believe:
+
+* Add a git remote
+* Mark it as dead
+* Remove the git remote, re-add with the same name
+
+What is the expected output? What do you see instead?
+
+When I do a `git annex status` I see:
+
+ 	04e701b5-8a22-4391-ad74-d75dde715c7b -- bigserver
+ 	6ddfda5d-0f17-45a9-b41a-2a626a823101 -- bigserver
+
+What version of git-annex are you using? On what operating system?
+
+4.20130323 on OSX and Linux
+
+Please provide any additional information below.
+
+Trying to get a file from bigserver kept on failing with the message "Try making some of these repositories available". Which led me on a wild goose chases blaming SSH keys and PATH issues.
+
diff --git a/doc/bugs/data_loss_with___34__git_annex_add__34___on_android_in_direct_mode_/comment_4_ad0dbdc448fff2e126ffec9aac6d7463._comment b/doc/bugs/data_loss_with___34__git_annex_add__34___on_android_in_direct_mode_/comment_4_ad0dbdc448fff2e126ffec9aac6d7463._comment
new file mode 100644
index 000000000..47c53ac84
--- /dev/null
+++ b/doc/bugs/data_loss_with___34__git_annex_add__34___on_android_in_direct_mode_/comment_4_ad0dbdc448fff2e126ffec9aac6d7463._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn26WQjIP5fnMgQF_L_k3Q3UrR5v8mjRTY"
+ nickname="Ellis"
+ subject="comment 4"
+ date="2013-04-03T09:02:44Z"
+ content="""
+*The truely odd thing about this is that when git-annex adds a direct mode file, it does not touch the file at all. The file is left right where it is.*
+
+After further investigation, I've managed to reproduce the error, and it is **not** caused by git-annex, but by a limitation in my device's sdcard overlay (I can now see that I was using it in an unintended fashion).  Sorry to have taken your time with this.  However, the following information may be useful for others who might also want to use git-annex from the android console to manager their media.
+
+Some android devices don't have sdcards (they are the ones which want you to use MTP (Media Transfer Protocol) to transfer data via a USB cable).  These devices emulate an sdcard for use by apps.  On my Samsung Galaxy Nexus, the emulated sdcard is at ``/sdcard``.  If your device is rooted, you will find the equivalent \"real\" filesystem at ``/data/media/0``.  There is apparently a limitation in the sdcard emulator which causes ``mv`` commands involving multiple files to semi-randomly fail when moving files from ``/sdcard`` to ``/data/media/0``.  What happens is that the command will randomly tend to replace some of the files in the move with a hardlink to another one of the files.  I have encountered no problems when moving files from ``/sdcard`` any other destination.
+
+So **don't do this** (or variants of it):
+
+    $ mv /sdcard/DCIM/Camera/* /data/media/0/annex-on-a-good-fs/import
+
+My reason for placing the repository under ``/data/media/0/`` is so that git-annex can use a non-crippled filesystem, but at the same time other apps can access the data under ``/sdcard``.  To get around the above problem, either of these two commands can be used:
+
+    $ mv /sdcard/DCIM/Camera/* /sdcard/annex-on-a-good-fs/import
+    $ mv /data/media/0/DCIM/Camera/* /data/media/0/annex-on-a-good-fs/import
+
+@joey: the instructions say to link this bug to ``done`` when it's closed, but I don't see how to do that?  Or should it be deleted, since it wasn't a git-annex bug at all?
+"""]]
diff --git a/doc/bugs/git-annex:_Not_in_a_git_repository._/comment_4_8c49979b8a815f0d6f9de39ee9a88730._comment b/doc/bugs/git-annex:_Not_in_a_git_repository._/comment_4_8c49979b8a815f0d6f9de39ee9a88730._comment
new file mode 100644
index 000000000..3b7fee676
--- /dev/null
+++ b/doc/bugs/git-annex:_Not_in_a_git_repository._/comment_4_8c49979b8a815f0d6f9de39ee9a88730._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="modules"
+ ip="2.206.0.102"
+ subject="comment 4"
+ date="2013-04-03T07:45:53Z"
+ content="""
+Seems like a user error from my side. I removed repos while webapp was still running. Removing ~/.config/git-annex solved my problem. Thanks.
+"""]]