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

4 files changed, 55 insertions, 8 deletions

diff --git a/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_1_d4baa6607a61d0e6a7cea1325a5ddf95._comment b/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_1_d4baa6607a61d0e6a7cea1325a5ddf95._comment
new file mode 100644
index 000000000..70c3f77d0
--- /dev/null
+++ b/doc/bugs/git-annex_get:_requested_key_is_not_present/comment_1_d4baa6607a61d0e6a7cea1325a5ddf95._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-04-27T19:54:42Z"
+ content="""
+This error message means that the file's content is not present on your server. 
+
+It seems like git-annex *thinks* the file is there, so it sent it there. But something appears to have happened to it.
+
+You can investigate like this:
+
+* Get the file's key, by running `basename $(git cat-file p 'HEAD:Musik/+⁄-/2003 - You Are Here (Bonus Disc)/01 - I've Been Lost.ogg')`
+* Run `find` in /mnt/raid/Audio on the server, and grep for that key.
+
+If that finds any files, we may have a git-annex bug of some kind.
+
+If it finds an empty directory, that's an indication that the file's content was sent to the server before, but has now somehow gotten deleted.
+
+----
+
+You may also want to run, on the client: `git annex fsck --fast --from eifel.fritz.box__mnt_raid_Audio`  
+That will check that all the files it thinks should be on the server are still there. If it says \"fixing location log\",
+then it's found other files that were expected to be on the server but don't seem to be any longer.
+
+"""]]
diff --git a/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_3_301f3ff2d203ac4c58a037e553b2c14d._comment b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_3_301f3ff2d203ac4c58a037e553b2c14d._comment
new file mode 100644
index 000000000..f69cef333
--- /dev/null
+++ b/doc/bugs/upgraded_annex__44___suddenly_trying_to_grab_archive_content_onto_client_again/comment_3_301f3ff2d203ac4c58a037e553b2c14d._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-04-27T19:35:15Z"
+ content="""
+Are either the USB drive or the ssh remote configured to be in the archive or smallarchive group?
+
+If not, there was a recent change to how archive directories are handled, which would explain this behavior:
+
+<pre>
+  * Adjust preferred content expressions so that content in archive
+    directories is preferred until it has reached an archive or smallarchive
+    repository.
+</pre>
+
+The solution would be to make the USB drive be in the archive group, probably..
+"""]]
diff --git a/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment b/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment
deleted file mode 100644
index a338fa0bf..000000000
--- a/doc/design/assistant/xmpp/comment_3_88470c9b1b35e0c3f748948b73bc923a._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="hhm"
- ip="108.17.80.177"
- subject="file transfer?"
- date="2013-04-23T10:22:43Z"
- content="""
-Would it be possible to add optional support for transferring files over XMPP (possibly being disabled out-of-the-box so as not to suck up third-party bandwidth)?
-"""]]
diff --git a/doc/forum/git-annex_across_two_filesystems/comment_2_39adeebc1af9c437f1fc2e00c07509bf._comment b/doc/forum/git-annex_across_two_filesystems/comment_2_39adeebc1af9c437f1fc2e00c07509bf._comment
new file mode 100644
index 000000000..ef57bdfec
--- /dev/null
+++ b/doc/forum/git-annex_across_two_filesystems/comment_2_39adeebc1af9c437f1fc2e00c07509bf._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://pradermecker.myopenid.com/"
+ ip="81.244.215.244"
+ subject="comment 2"
+ date="2013-04-27T17:14:43Z"
+ content="""
+It works fine. After it is set up with the client as described, sync is automatic from the Assistant.
+
+What I find cumbersome is the fact that I need to manually call \"git annex sync\" on the remote (usb or local ssh) to view (generate) the link. Is there a way to avoid this extra step ?
+
+"""]]