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

13 files changed, 448 insertions, 4 deletions

diff --git a/doc/bugs/Assistant_merge_loop/comment_12_fc5ceb09cc358521b32877fe4b0fb821._comment b/doc/bugs/Assistant_merge_loop/comment_12_fc5ceb09cc358521b32877fe4b0fb821._comment
new file mode 100644
index 000000000..7e0a534da
--- /dev/null
+++ b/doc/bugs/Assistant_merge_loop/comment_12_fc5ceb09cc358521b32877fe4b0fb821._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="EskildHustvedt"
+ ip="80.202.103.55"
+ subject="comment 12"
+ date="2014-07-19T06:22:57Z"
+ content="""
+This issue has been resolved for me. No new empty merges since 2014-07-12.
+"""]]
diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn
new file mode 100644
index 000000000..dddef7b36
--- /dev/null
+++ b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn
@@ -0,0 +1,88 @@
+**Premise:**
+
+I've had this problem before 5.20140709-gc75193e and when the [ugly bug](http://git-annex.branchable.com/devblog/day_193-194__ugly_bug/) was discovered and fixed, I updated and thought it was gone.
+Yet, I'm still experiencing a content removal bug, so it might be something different altogether.
+I should also add that I don't know much about git log history and git-annex inner workings. I might need some help with finding the necessary information for debugging.
+
+**Bug description:**
+
+Two local computers, running Ubuntu-14.04 and Fedora-20 respectively, are paired through the assistant and functional with git annex 5.20140709. In direct mode. Most of the time, everything seems to work fine. Sometimes, *Computer A* will modify one file in its repository while *B* is offline. When *B* comes back online both repositories will lose their copy of the modified file (I'm not sure whether this also happens when they're both online when the change happens; it doesn't look like it anyway). The rest of the data in the repository is intact. This does not happen every time and I haven't been able to reproduce it consistently. Since 5.20140709 came out, it happened 2 or 3 times.
+
+Looking at 'git log --stat' in *B*:
+
+    commit d9eb9e94a39
+    Author: COMPUTER B
+    Date:   Thu Jul 17 18:17:16 2014 +0200
+      shared.skg | 1 -
+      1 file changed, 1 deletion(-)
+
+    commit 6fa27f08492
+    Author: COMPUTER A
+    Date:   Thu Jul 17 18:17:14 2014 +0200
+      shared.skg | 1 +
+      1 file changed, 1 insertion(+)
+
+    commit d25cc793739
+    Author: COMPUTER A
+    Date:   Thu Jul 17 18:17:12 2014 +0200
+      shared.skg | 1 -
+      1 file changed, 1 deletion(-)
+
+A change is apparently deleting and rewriting the whole file (maybe that's normal because it's a binary (encrypted) file?). The third most recent deletion is probably the one that shouldn't happen.
+
+Reverting "d9eb9e94a39" will only recover a placeholder, not really the original file. I can get the content back by going through *git annex unused* with *git log -S'key'*, then going to indirect mode, and then using *addunused*. This can only be done in the repository that changed the file in the first place (repo A), as the other repository only has the older version of the file in its unused list. This probably means that the change did not propagate before the file was deleted.
+
+**daemon.log transcript**
+
+[[!format sh """
+
+[2014-07-17 18:13:17 CEST] main: starting assistant version 5.20140709-gc75193e
+[2014-07-17 18:13:17 CEST] Cronner: You should enable consistency checking to protect your data. 
+[2014-07-17 18:13:55 CEST] TransferScanner: Syncing with asus.local_sincro 
+(scanning...) [2014-07-17 18:13:55 CEST] Watcher: Performing startup scan
+p11-kit: couldn't load module: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: cannot open shared object file: No such file or directory
+p11-kit: couldn't load module: /usr/lib/x86_64-linux-gnu/pkcs11/gnome-keyring-pkcs11.so: /usr/lib/x86_64-linux-gnu/pkcs11/gnome-keyring-pkcs11.so: cannot open shared object file: No such file or directory
+(started...) p11-kit: couldn't load module: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so: cannot open shared object file: No such file or directory
+p11-kit: couldn't load module: /usr/lib/x86_64-linux-gnu/pkcs11/gnome-keyring-pkcs11.so: /usr/lib/x86_64-linux-gnu/pkcs11/gnome-keyring-pkcs11.so: cannot open shared object file: No such file or directory
+gpg: Signature made gio 17 lug 2014 18:02:09 CEST using DSA key ID 89C809CB
+gpg: /tmp/git-annex-gpg.tmp.0/trustdb.gpg: trustdb created
+gpg: Good signature from "git-annex distribution signing key (for Joey Hess) <id@joeyh.name>"
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 4005 5C6A FD2D 526B 2961  E78F 5EE1 DBA7 89C8 09CB
+[2014-07-17 18:13:58 CEST] Upgrader: An upgrade of git-annex is available.  (version 5.20140716)
+Everything up-to-date
+git-annex-shell: key is already present in annex
+rsync: connection unexpectedly closed (0 bytes received so far) [sender]
+rsync error: error in rsync protocol data stream (code 12) at io.c(226) [sender=3.1.0]
+
+########## SYNCING STARTS HERE ###########
+
+[2014-07-17 18:17:12 CEST] RemoteControl: Syncing with asus.local_sincro 
+From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro
+   51815ea..d25cc79  annex/direct/master -> asus.local_sincro/annex/direct/master
+   0391880..49efa5f  git-annex  -> asus.local_sincro/git-annex
+   51815ea..d25cc79  master     -> asus.local_sincro/master
+   51815ea..d25cc79  synced/master -> asus.local_sincro/synced/master
+[2014-07-17 18:17:15 CEST] RemoteControl: Syncing with asus.local_sincro 
+Automatic merge went well; stopped before committing as requested
+Removing shared.skg
+From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro
+   d25cc79..6fa27f0  annex/direct/master -> asus.local_sincro/annex/direct/master
+   d25cc79..6fa27f0  master     -> asus.local_sincro/master
+   d25cc79..6fa27f0  synced/master -> asus.local_sincro/synced/master
+[2014-07-17 18:17:16 CEST] Committer: Committing changes to git
+[2014-07-17 18:17:16 CEST] Pusher: Syncing with asus.local_sincro 
+To ssh://USER-A@git-annex-asus.local-USER-A_22_sincro/~/sincro/
+   0391880..8d1c927  git-annex -> synced/git-annex
+   6fa27f0..d9eb9e9  annex/direct/master -> synced/master
+[2014-07-17 18:17:17 CEST] RemoteControl: Syncing with asus.local_sincro 
+From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro
+   49efa5f..e328661  git-annex  -> asus.local_sincro/git-annex
+[2014-07-17 18:17:20 CEST] RemoteControl: Syncing with asus.local_sincro 
+From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro
+   6fa27f0..d9eb9e9  annex/direct/master -> asus.local_sincro/annex/direct/master
+   e328661..32e44ce  git-annex  -> asus.local_sincro/git-annex
+
+# End of transcript or log.
+"""]]
diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn
index ecc908463..0dac527df 100644
--- a/doc/encryption.mdwn
+++ b/doc/encryption.mdwn
@@ -18,7 +18,7 @@ You should decide whether to use encryption with a special remote before
 any data is stored in it. So, `git annex initremote` requires you
 to specify "encryption=none" when first setting up a remote in order
 to disable encryption. To use encryption, you run 
-run `git-annex initremote` in one of these ways:
+`git-annex initremote` in one of these ways:
 
 * `git annex initremote newremote type=... encryption=hybrid keyid=KEYID ...`
 * `git annex initremote newremote type=... encryption=shared`
@@ -43,7 +43,7 @@ enableremote` specifying the new encryption key:
 	git annex enableremote myremote keyid+=788A3F4C
 
 While a key can later be removed from the list, note that
-that will **not** necessarily prevent the owner of the key
+it will **not** necessarily prevent the owner of the key
 from accessing data on the remote (which is by design impossible to prevent,
 short of deleting the remote). In fact the only sound use of `keyid-=` is
 probably to replace a revoked key:
@@ -74,7 +74,7 @@ and since it's exactly the way everyone else uses gpg.
 
 	git annex initremote newremote type=.... encryption=pubkey keyid=KEYID ...
 
-A disavantage is that is not easy to later add additional public keys
+A disavantage is that it is not easy to later add additional public keys
 to the special remote. While the `enableremote` parameters `keyid+=` and
 `keyid-=` can be used, they have **no effect** on files that are already
 present on the remote. Probably the only use for these parameters is 
@@ -94,7 +94,7 @@ generated (and encrypted to the given key IDs).)
 ## MAC algorithm
 
 The default MAC algorithm to be applied on the filenames is HMACSHA1. A
-stronger one, for instance HMACSHA512, one can be chosen upon creation
+stronger one, for instance HMACSHA512, can be chosen upon creation
 of the special remote with the option `mac=HMACSHA512`. The available
 MAC algorithms are HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384, and
 HMACSHA512. Note that it is not possible to change algorithm for a
diff --git a/doc/forum/Archive_USB_drive_not_working_as_documented.mdwn b/doc/forum/Archive_USB_drive_not_working_as_documented.mdwn
new file mode 100644
index 000000000..73c2db6de
--- /dev/null
+++ b/doc/forum/Archive_USB_drive_not_working_as_documented.mdwn
@@ -0,0 +1,171 @@
+I'm hoping to use git-annex in a project to manage large image files and maintain archived copies of them on removable USB drives. But I can't get this to work the way it's described in the walkthrough and in the "git-annex/tips/offline archive drives" example. Here's what I did:
+
+    marshal@home[~]> git-annex version
+    git-annex version: 5.20140412ubuntu1
+    build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
+    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+    remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+
+Create the local repo:
+
+    marshal@home[~]> mkdir ~/annex
+    marshal@home[~]> cd ~/annex
+    marshal@home[~/annex]> git init
+    Initialized empty Git repository in /home/marshal/annex/.git/
+    marshal@home[~/annex]> git annex init "my laptop"
+    init my laptop ok
+    (Recording state in git...)
+
+Create the remote repo (assume the warning can be ignored?)
+
+    marshal@home[~/annex]> cd /media/marshal/Sony\ USB/
+    marshal@home[/media/marshal/Sony USB]> git clone ~/annex
+    Cloning into 'annex'...
+    done.
+    warning: remote HEAD refers to nonexistent ref, unable to checkout.
+    marshal@home[/media/marshal/Sony USB]> cd annex
+    marshal@home[/media/marshal/Sony USB/annex]> git annex init "usbdrive"
+    init usbdrive ok
+    (Recording state in git...)
+
+Make them remotes of each other
+
+    marshal@home[/media/marshal/Sony USB/annex]> git remote add laptop ~/annex
+    marshal@home[/media/marshal/Sony USB/annex]> cd ~/annex
+    marshal@home[~/annex]> git remote add usbdrive /media/marshal/Sony\ USB/annex/
+
+Add some files into the local repo
+
+    marshal@home[~/annex]> cp ~/Desktop/file* .
+    marshal@home[~/annex]> git annex add .
+    add file1.m3u ok
+    add file2.sh ok
+    add file3.pdf ok
+    (Recording state in git...)
+    marshal@home[~/annex]> git commit -a -m "added files"
+    [master (root-commit) 4ea3be7] added files
+     3 files changed, 3 insertions(+)
+     create mode 120000 file1.m3u
+     create mode 120000 file2.sh
+     create mode 120000 file3.pdf
+
+Change the preferred content settings
+
+    marshal@home[~/annex]> git annex group usbdrive archive
+    group usbdrive ok
+    (Recording state in git...)
+    marshal@home[~/annex]> git annex wanted usbdrive standard
+    wanted usbdrive ok
+    (Recording state in git...)
+
+Sync to the usbdrive repo
+
+    marshal@home[~/annex]> git annex sync usbdrive
+    commit  ok
+    pull usbdrive 
+    remote: Counting objects: 7, done.
+    remote: Compressing objects: 100% (3/3), done.
+    remote: Total 5 (delta 1), reused 0 (delta 0)
+    Unpacking objects: 100% (5/5), done.
+    From /media/marshal/Sony USB/annex
+     * [new branch]      git-annex  -> usbdrive/git-annex
+    ok
+    (merging usbdrive/git-annex into git-annex...)
+    (Recording state in git...)
+    push usbdrive 
+    Counting objects: 29, done.
+    Delta compression using up to 8 threads.
+    Compressing objects: 100% (22/22), done.
+    Writing objects: 100% (25/25), 2.44 KiB | 0 bytes/s, done.
+    Total 25 (delta 3), reused 0 (delta 0)
+    To /media/marshal/Sony USB/annex/
+     * [new branch]      git-annex -> synced/git-annex
+     * [new branch]      master -> synced/master
+    ok
+
+Copy eveything to the usbdrive repo
+
+    marshal@home[~/annex]> git-annex copy --auto --to usbdrive
+    copy file1.m3u (to usbdrive...) 
+    SHA256E-s64061--c388e2c927cb4c88c11b1b5a8e166c4d8080dc528d53954dad1ee6d4933ce3c7.m3u
+             64,061 100%   29.84MB/s    0:00:00 (xfr#1, to-chk=0/1)
+    ok
+    copy file2.sh (to usbdrive...) 
+    SHA256E-s318--b8729560cc759d2256903feaa4ba65994ccbac94f30515d52a39083ad52e1bad.sh
+                318 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
+    ok
+    copy file3.pdf (to usbdrive...) 
+    SHA256E-s32239--9b051067d5ef9f0cb4a01750901bf6bee3f9348e5b10138c8ef416ac8d51e5df.pdf
+             32,239 100%    0.00kB/s    0:00:00 (xfr#1, to-chk=0/1)
+    ok
+    (Recording state in git...)
+
+Check to see where git-annex "thinks" the files are
+
+    marshal@home[~/annex]> git-annex whereis file1.m3u 
+    whereis file1.m3u (2 copies) 
+          	80fa5a68-3843-4e25-b4c9-53a8c51ba9ff -- here (my laptop)
+           	d642b276-5f9b-4a5c-a42e-ea29cd9540b5 -- usbdrive
+    ok
+
+Check the filesystem results
+
+    marshal@home[~/annex]> ls -la ~/annex
+    total 48
+    drwxrwxr-x  3 marshal marshal  4096 Jul 19 14:59 .
+    drwxr-xr-x 99 marshal marshal 24576 Jul 19 14:55 ..
+    lrwxrwxrwx  1 marshal marshal   194 Jul 19 14:59 file1.m3u -> .git/annex/objects/jq/MW/SHA256E-s64061--c388e2c927cb4c88c11b1b5a8e166c4d8080dc528d53954dad1ee6d4933ce3c7.m3u/SHA256E-s64061--c388e2c927cb4c88c11b1b5a8e166c4d8080dc528d53954dad1ee6d4933ce3c7.m3u
+    lrwxrwxrwx  1 marshal marshal   188 Jul 19 14:59 file2.sh -> .git/annex/objects/1J/2K/SHA256E-s318--b8729560cc759d2256903feaa4ba65994ccbac94f30515d52a39083ad52e1bad.sh/SHA256E-    s318--b8729560cc759d2256903feaa4ba65994ccbac94f30515d52a39083ad52e1bad.sh
+    lrwxrwxrwx  1 marshal marshal   194 Jul 19 14:59 file3.pdf -> .git/annex/objects/77/Wj/SHA256E-s32239--9b051067d5ef9f0cb4a01750901bf6bee3f9348e5b10138c8ef416ac8d51e5df.pdf/SHA256E-s32239--9b051067d5ef9f0cb4a01750901bf6bee3f9348e5b10138c8ef416ac8d51e5df.pdf
+    drwxrwxr-x  9 marshal marshal  4096 Jul 19 15:04 .git
+    marshal@home[~/annex]> ls -la /media/marshal/Sony\ USB/annex/
+    total 4
+    drwx------ 1 marshal marshal  144 Jul 19 14:56 .
+    drwx------ 1 marshal marshal 4096 Jul 19 14:56 ..
+    drwx------ 1 marshal marshal  448 Jul 19 14:57 .git
+
+Why is there nothing in the usbdrive repo? And worse, why is the whereis command saying there are 2 copies?
+
+But if I sync from the usbdrive repo, the files are copied
+
+    marshal@home[~/annex]> cd /media/marshal/Sony\ USB/annex/
+    marshal@home[/media/marshal/Sony USB/annex]> git-annex sync laptop
+    (merging synced/git-annex origin/git-annex into git-annex...)
+    (Recording state in git...)
+    commit  ok
+    pull laptop 
+    remote: Counting objects: 23, done.
+    remote: Compressing objects: 100% (8/8), done.
+    remote: Total 11 (delta 3), reused 0 (delta 0)
+    Unpacking objects: 100% (11/11), done.
+    From /home/marshal/annex
+     * [new branch]      git-annex  -> laptop/git-annex
+     * [new branch]      master     -> laptop/master
+     * [new branch]      synced/master -> laptop/synced/master
+    
+    
+    Already up-to-date.
+    ok
+    (merging laptop/git-annex into git-annex...)
+    (Recording state in git...)
+    push laptop 
+    Counting objects: 56, done.
+    Delta compression using up to 8 threads.
+    Compressing objects: 100% (24/24), done.
+    Writing objects: 100% (33/33), 2.34 KiB | 0 bytes/s, done.
+    Total 33 (delta 15), reused 0 (delta 0)
+    To /home/marshal/annex
+     * [new branch]      git-annex -> synced/git-annex
+    ok
+    marshal@home[/media/marshal/Sony USB/annex]> ls -la /media/marshal/Sony\ USB/annex/
+    total 6
+    drwx------ 1 marshal marshal  456 Jul 19 15:07 .
+    drwx------ 1 marshal marshal 4096 Jul 19 14:56 ..
+    lrwxrwxrwx 1 marshal marshal  396 Jul 19 15:07 file1.m3u -> .git/annex/objects/jq/MW/SHA256E-s64061--c388e2c927cb4c88c11b1b5a8e166c4d8080dc528d53954dad1ee6d4933ce3c7.m3u/SHA256E-s64061--c388e2c927cb4c88c11b1b5a8e166c4d8080dc528d53954dad1ee6d4933ce3c7.m3u
+    lrwxrwxrwx 1 marshal marshal  384 Jul 19 15:07 file2.sh -> .git/annex/objects/1J/2K/SHA256E-s318--b8729560cc759d2256903feaa4ba65994ccbac94f30515d52a39083ad52e1bad.sh/SHA256E-s318--b8729560cc759d2256903feaa4ba65994ccbac94f30515d52a39083ad52e1bad.sh
+    lrwxrwxrwx 1 marshal marshal  396 Jul 19 15:07 file3.pdf -> .git/annex/objects/77/Wj/SHA256E-s32239--9b051067d5ef9f0cb4a01750901bf6bee3f9348e5b10138c8ef416ac8d51e5df.pdf/SHA256E-s32239--9b051067d5ef9f0cb4a01750901bf6bee3f9348e5b10138c8ef416ac8d51e5df.pdf
+    drwx------ 1 marshal marshal  448 Jul 19 15:07 .git
+
+Why did I have to sync from the usbdrive? I expected the repo setup and the --auto option to copy the files. What am I missing?
+
+Any help much appreciated.
diff --git a/doc/forum/Corrupted_repository__44___can_not_be_repaired.mdwn b/doc/forum/Corrupted_repository__44___can_not_be_repaired.mdwn
new file mode 100644
index 000000000..e2b4357bf
--- /dev/null
+++ b/doc/forum/Corrupted_repository__44___can_not_be_repaired.mdwn
@@ -0,0 +1,40 @@
+Hey, I hope somebody can help me:
+
+I recently moved a bunch of files to another location shortly after I renamed them. The assistant was running (repo: indirect mode) and I guess the assistant was confused about whether to commit the rename changes or to fix the symlinks because of the location move (and to commit these changes). I don't know much about the internal design, but after that my repository was kinda broken. Every git command failed and also "git fsck" gave me some error messages. However, I mounted my external drive (backup repo) and tried a "git annex repair". It took quite a while, but it could fix the repo....somehow. This is the current status:
+
+    ~/private [master●] » git annex info
+    repository mode: indirect
+    trusted repositories: error: refs/remotes/extern/git-annex does not point to a valid object!
+    error: refs/remotes/extern/git-annex does not point to a valid object!
+    error: unable to resolve reference refs/heads/git-annex: Datei oder Verzeichnis nicht gefunden // (english: No such file or directory)
+    fatal: Cannot lock the ref 'refs/heads/git-annex'.
+    git-annex: git [Param "update-ref",Param "refs/heads/git-annex",Param "ea4d4b5e09bfd10c714c24ca76ab5af0625bb6a7"] failed
+
+    ~/private [master●] » git fsck
+    Checking object directories: 100% (256/256), done.
+    Checking objects: 100% (654755/654755), done.
+    error: refs/remotes/extern/git-annex does not point to a valid object!
+    error: bad ref for refs/heads/git-annex
+    Checking connectivity: 654760, done.
+    dangling blob cb2a012e65b15baf0bc51cb8ac6ab05c4ac4e543
+    dangling blob 6a48216d54be6fbf0539c86501ce9e4567ebf678
+    dangling blob 3f8f21304c6dcfc6ace92093425d7f057138b5e8
+    dangling blob 4943840264ad7c06071f510261151c28b4fb5168
+    dangling blob d67e845b06b17c3ba5b44a454d3128dea6ebe8cc
+    dangling blob 38b7e4ce06a84c03b9a0f7f3a84872b2ed202421
+    dangling blob ca0a65e010c69e02953d63f33c5f2030f793c8ff
+    dangling blob aeba65035f566ec9f18ad2ba71b155b0efd2193a
+    dangling blob d3cea542db4c2904f5c8c6dd98ca3868074e6d36
+    dangling commit fe1026edee5dcc6306f04ebe1a7762b86678db8a
+    [... some more dangling objects ...]
+
+However, git annex repair does not want to repair my repo a second time:
+
+    ~/private [master●] » git annex repair
+    Running git fsck ...
+    No problems found.
+    ok
+My directory seems to be fine, also the data (symlinks) I renamed & moved are also fine. Just the "git-annex" branch seems to be broken now and I don't know how to fix that.
+
+Cheers,
+Stephan
diff --git a/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_1_297ea9c13096f6360358b3a3e7197c03._comment b/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_1_297ea9c13096f6360358b3a3e7197c03._comment
new file mode 100644
index 000000000..63878f19e
--- /dev/null
+++ b/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_1_297ea9c13096f6360358b3a3e7197c03._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="sts"
+ ip="134.147.73.126"
+ subject="comment 1"
+ date="2014-07-18T09:46:01Z"
+ content="""
+I forgot, this might be interesting
+
+    git show ea4d4b5e09bfd10c714c24ca76ab5af0625bb6a7
+    
+    commit ea4d4b5e09bfd10c714c24ca76ab5af0625bb6a7
+    Author: Stephan Schindel <sts@tp1.rub.de>
+    Date:   Fri Jul 18 11:28:07 2014 +0200
+
+        branch created
+
+and
+
+    ~/private [master●] » git annex fsck
+    error: refs/remotes/extern/git-annex does not point to a valid object!
+    error: refs/remotes/extern/git-annex does not point to a valid object!
+    error: unable to resolve reference refs/heads/git-annex: Datei oder Verzeichnis nicht gefunden
+    fatal: Cannot lock the ref 'refs/heads/git-annex'.
+    git-annex: git [Param \"update-ref\",Param \"refs/heads/git-annex\",Param \"199fbe3e7ca1dbce99ffa04e440209eb93446374\"] failed
+
+
+and
+
+    git show 199fbe3e7ca1dbce99ffa04e440209eb93446374
+
+    commit 199fbe3e7ca1dbce99ffa04e440209eb93446374
+    Author: Stephan Schindel <sts@tp1.rub.de>
+    Date:   Fri Jul 18 11:46:29 2014 +0200
+
+        branch created
+
+"""]]
diff --git a/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_2_c3aabffbe9568cf7acb4018e445f22a5._comment b/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_2_c3aabffbe9568cf7acb4018e445f22a5._comment
new file mode 100644
index 000000000..04e11a78c
--- /dev/null
+++ b/doc/forum/Corrupted_repository__44___can_not_be_repaired/comment_2_c3aabffbe9568cf7acb4018e445f22a5._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="sts"
+ ip="134.147.73.126"
+ subject="comment 2"
+ date="2014-07-18T11:17:49Z"
+ content="""
+Ok, I could fix this issue by doing a fresh clone of one of my remotes:
+
+    git clone path/to/remote
+    [move objects folder from broken repo .git/annex/objects to new clone]
+    git annex info (look for UUID or DESC)
+    git annex reinit \"DESC\"
+"""]]
diff --git a/doc/forum/MegaAnnex_not_working./comment_2_f3eaf1ee06ebac951514d865f298f9d3._comment b/doc/forum/MegaAnnex_not_working./comment_2_f3eaf1ee06ebac951514d865f298f9d3._comment
new file mode 100644
index 000000000..e9fd01f14
--- /dev/null
+++ b/doc/forum/MegaAnnex_not_working./comment_2_f3eaf1ee06ebac951514d865f298f9d3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmqaNwDQ367zpW6cIRviLz6zJZZFODgoEI"
+ nickname="Zack"
+ subject="comment 2"
+ date="2014-07-19T12:48:08Z"
+ content="""
+I believe it may have been removed, unfortunately. :(
+"""]]
diff --git a/doc/forum/Ssh_remote_on_NAS/comment_4_423244f174123318f1ece7b5794aeea5._comment b/doc/forum/Ssh_remote_on_NAS/comment_4_423244f174123318f1ece7b5794aeea5._comment
new file mode 100644
index 000000000..9b0a03ecf
--- /dev/null
+++ b/doc/forum/Ssh_remote_on_NAS/comment_4_423244f174123318f1ece7b5794aeea5._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="feulif"
+ ip="151.27.171.22"
+ subject="comment 4"
+ date="2014-07-17T22:24:45Z"
+ content="""
+First of all, I understand this is more a nas-related issue rather than a git-annex-related one, so thank you for your support and valuable software.
+
+But I'm still struggling with this error.
+
+Now I've reinstalled git on the NAS and, as previously, I can run every git command when I'm logged in.
+But when I try to sync my PC with the git remote on the NAS, then I get this error:
+
+
+    git annex sync
+    sh: git-annex-shell: command not found
+    sh: git-upload-pack: command not found
+    fatal: Could not read from remote repository.
+    
+    Please make sure you have the correct access rights
+    and the repository exists.
+    commit  
+    ok
+    git-annex: no branch is checked out
+
+Can this be really related to some access right? What user is git annex using when syncing with an SSH remote (e.g. admin) ? the one I specified when setting up the remote? where is it complaining about git-upload-pack non found, on the nas or on the PC I'm syncing from?
+
+"""]]
diff --git a/doc/forum/Standard_groups__47__preferred_contents/comment_1_143aa3095d7222c869c36a5039282e35._comment b/doc/forum/Standard_groups__47__preferred_contents/comment_1_143aa3095d7222c869c36a5039282e35._comment
new file mode 100644
index 000000000..343a049e7
--- /dev/null
+++ b/doc/forum/Standard_groups__47__preferred_contents/comment_1_143aa3095d7222c869c36a5039282e35._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="sts"
+ ip="134.147.73.126"
+ subject="comment 1"
+ date="2014-07-18T21:16:50Z"
+ content="""
+> First, basic: Is the \"preferred content group\" an attribute of a repository or of a remote? E.g., when I use assistant, I can set this property for a remote repository. Will this property be synced to all other clients then or is it only valid for this particular client?
+
+Yeah, it syncs the content group between the remotes, so you have to set it only in one repository and the information gets synced across the network.
+
+> Second, I think the standard groups do still not cover what I want and I wonder if this could be done with preferred contents somehow? What I want:
+> Generally only the structure should be synced, no contents (i.e. \"manual\" is the closest)
+
+Well, I guess you have to manually create a git repo (but no annex repo!) on your remote. Once you add the remote the assistant should tell you that he can only sync the metadata, but no contents.
+
+"""]]
diff --git a/doc/forum/Standard_groups__47__preferred_contents/comment_2_65bef012eb113986a2e9b02470a6cbd1._comment b/doc/forum/Standard_groups__47__preferred_contents/comment_2_65bef012eb113986a2e9b02470a6cbd1._comment
new file mode 100644
index 000000000..df204b058
--- /dev/null
+++ b/doc/forum/Standard_groups__47__preferred_contents/comment_2_65bef012eb113986a2e9b02470a6cbd1._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8"
+ nickname="daniele"
+ subject="comment 2"
+ date="2014-07-19T00:38:58Z"
+ content="""
+    Generally only the structure should be synced, no contents (i.e. \"manual\" is the closest)
+    Currently it seems that when it changes remotely, it is \"dropped\" again so I need to manually use \"git annex get\" again
+
+Maybe this could work? 
+
+(in preferred content) exclude=\"*\" and present
+
+So that what is present is preferred and not dropped, everything else is not downloaded unless the user explicitly asks to get it.
+"""]]
diff --git a/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_4_5925b609aff0954f2860269cff107284._comment b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_4_5925b609aff0954f2860269cff107284._comment
new file mode 100644
index 000000000..31a7e63d8
--- /dev/null
+++ b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_4_5925b609aff0954f2860269cff107284._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
+ nickname="maurizio"
+ subject="comment 4"
+ date="2014-07-17T19:48:30Z"
+ content="""
+I may be facing one unexpected behavior, but your statement that the \"webapp certainely allows to delete repositories\" does not match my experience. It does offer this option, but this option has failed on me so many times that I have learnt to live with a couple of repositories disabled, sitting here. Trying to delete them starts some process (emptying the repository, starting deletion process) but ends up in nothing. At least one of them does not seem to have a name anymore (probably what you refer to as $uuid) since only the part in square bracket is visible in the webapp. I concluded that this was what the webapp was supposed to do. 
+"""]]
diff --git a/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_5_45062d5776f8aefb0850d70f2a517c75._comment b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_5_45062d5776f8aefb0850d70f2a517c75._comment
new file mode 100644
index 000000000..3dbae84a0
--- /dev/null
+++ b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_5_45062d5776f8aefb0850d70f2a517c75._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
+ nickname="maurizio"
+ subject="comment 5"
+ date="2014-07-18T08:13:08Z"
+ content="""
+by the way: the commands you suggest do not seem to match what I read here:
+
+http://git-annex.branchable.com/forum/How_to_delete_a_remote__63__/
+
+
+"""]]