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

6 files changed, 144 insertions, 0 deletions

diff --git a/doc/Android/comment_8_e97d2e4213324cef62d99edebab7ccb1._comment b/doc/Android/comment_8_e97d2e4213324cef62d99edebab7ccb1._comment
new file mode 100644
index 000000000..60fde6227
--- /dev/null
+++ b/doc/Android/comment_8_e97d2e4213324cef62d99edebab7ccb1._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="IgorGanapolsky"
+ avatar="http://cdn.libravatar.org/avatar/6bc0985e3dedceb150f08ad6456c84b2"
+ subject="Assistant doesn't launch in Android N"
+ date="2016-10-25T01:43:58Z"
+ content="""
+Hello,
+I have installed the APK on Android N.  However, the assistant doesn't launch, gives an error on terminal:
+\"Cannot link executive git-annex.\"
+
+What is causing this?  Please help.
+"""]]
diff --git a/doc/bugs/Files_reappear_after_delete.mdwn b/doc/bugs/Files_reappear_after_delete.mdwn
new file mode 100644
index 000000000..f53963945
--- /dev/null
+++ b/doc/bugs/Files_reappear_after_delete.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+I normally use two clients with the assistant (lets call them A and B) and they are usually online at different times.
+Sometimes, after deleting a file in A, I turn on the client in B and when rescanning, instead of deleting that same file from B, it adds it back to A.
+
+I can always delete the file again, but it's a bit annoying. Anyway, it's a lot better than data loss ;)
+
+Might be worthy to mention that the computer running client B is quite slow and has a slow HD. I have 4 git-annex repositories and when I turn on the computer the rescan can easily take up a couple of hours.
+
+
+### What steps will reproduce the problem?
+B -> is turned off
+
+A -> delete file
+
+B -> turn on and wait for rescan
+
+B -> readds the file instead of deleting it
+
+
+### What version of git-annex are you using? On what operating system?
+6.20160923 (Debian Sid)
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+I've been using git-annex for years with 4 different repositories, 3 of them pretty big (> 50 GB) and I'm really happy! :)
diff --git a/doc/forum/Managing_a_large_number_of_files_archived_on_many_pieces_of_read-only_medium___40__E.G._DVDs__41__/comment_13_0a343a8fdad66765371ca22581b35b84._comment b/doc/forum/Managing_a_large_number_of_files_archived_on_many_pieces_of_read-only_medium___40__E.G._DVDs__41__/comment_13_0a343a8fdad66765371ca22581b35b84._comment
new file mode 100644
index 000000000..2b3cf5839
--- /dev/null
+++ b/doc/forum/Managing_a_large_number_of_files_archived_on_many_pieces_of_read-only_medium___40__E.G._DVDs__41__/comment_13_0a343a8fdad66765371ca22581b35b84._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~stephane-gourichon-lpad"
+ nickname="stephane-gourichon-lpad"
+ avatar="http://cdn.libravatar.org/avatar/02d4a0af59175f9123720b4481d55a769ba954e20f6dd9b2792217d9fa0c6089"
+ subject="Not a priority in itself, still feels like a missing piece."
+ date="2016-10-26T12:29:50Z"
+ content="""
+> I have a large number of files that are accessed infrequently and stored off-line on DVD-Rs. I need to keep track of which files are on which disc so that when I want a file I can find it.
+> (...)
+> 4) Easily incorporate the current DVD-Rs into the new system
+
+This last item would make `git-annex` suitable to catalog existing WORM media.
+
+In the past I have used some programs but was never satisfied with their graphical-UI-first approach or closed format.  For example: gtktalog, cdcat, cdcollect, where is it, virtual volume view, gnome catalog, basenji.  Ref: https://alternativeto.net/software/cdcollect/?platform=linux . 
+
+I also used at some point a plain old `find|{stat;md5}|gzip > ~/catalogs/my_volume_id.gz` then `grep mystring ~/catalogs/*gz` which, at the end of the day, has an overall good cost/benefit ratio.
+
+IMHO git-annex has a sane foundation and the potential to do better than those tools.
+
+Technically this looks indeed similar to a web special remote, but needs to accommodate for arbitrary mount point and keep count of copies.
+
+To be honest, the DVD use case is not a priority for me at the moment, but it feels like a missing piece in an otherwise good puzzle.  As if handling this case nicely would actually benefit other, more modern use cases.
+
+"""]]
diff --git a/doc/forum/how_to_disaster_recovery/comment_9_b16c74c0add6d15b75163859a752d207._comment b/doc/forum/how_to_disaster_recovery/comment_9_b16c74c0add6d15b75163859a752d207._comment
new file mode 100644
index 000000000..b6ee528a2
--- /dev/null
+++ b/doc/forum/how_to_disaster_recovery/comment_9_b16c74c0add6d15b75163859a752d207._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="openmedi"
+ subject="comment 9"
+ date="2016-10-25T18:02:56Z"
+ content="""
+> […] if I remember correctly I tried to delete a branch and then the problems started […]
+
+This is not correct. I tried to delete a special remote.
+"""]]
diff --git a/doc/git-annex-unannex/comment_1_281aea2f018ea0fc98452c0d180c3bcb._comment b/doc/git-annex-unannex/comment_1_281aea2f018ea0fc98452c0d180c3bcb._comment
new file mode 100644
index 000000000..3d03f267f
--- /dev/null
+++ b/doc/git-annex-unannex/comment_1_281aea2f018ea0fc98452c0d180c3bcb._comment
@@ -0,0 +1,62 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~stephane-gourichon-lpad"
+ nickname="stephane-gourichon-lpad"
+ avatar="http://cdn.libravatar.org/avatar/02d4a0af59175f9123720b4481d55a769ba954e20f6dd9b2792217d9fa0c6089"
+ subject="This needs to commit first. Any alternative?"
+ date="2016-10-25T07:25:47Z"
+ content="""
+Hello and thank you for git-annex.
+
+## Context
+
+Every newbie needs to understand what steps are possible and what to do when a wrong step was made.
+
+
+The wording \"undo accidental add command\" suggested (to me at least) that it was intended to be issued just *right after* the accidental add command, *before any commit*.  
+
+## Steps to reproduce
+
+Right after `git annex add path`, do `git annex unannex path`.
+
+## Expected behavior
+
+`git annex unannex path` would undo the add.
+
+More precisely, it would walk the path given, find any symlink pointing to annexed data and not committed yet, and replace it with a plain file with the linked content, honoring `--fast` option if given.
+
+## Observed behavior
+
+    git-annex: Cannot proceed with uncommitted changes staged in the index. Recommend you: git commit
+
+If user follows this path, there will be two unnecessary commits: an add commit and an unannex commit.
+
+There may be reasons to prefer not to introduce those commits.  Granted, git allows to adjust history after the fact.  Is there a simpler solution?
+
+## Question, summarized
+
+Is there a command to just revert a \"add\", without introducing any commit?
+
+
+## Details
+
+Full test log below:
+
+```
+{
+cd /tmp/ ; mkdir testga ; cd testga ; 
+git init ; git annex init ; 
+echo \"test\" > test ; 
+git annex add test ; git annex unannex test
+}
+
+Initialized empty Git repository in /tmp/testga/.git/
+init  ok
+(recording state in git...)
+add test ok
+(recording state in git...)
+git-annex: Cannot proceed with uncommitted changes staged in the index. Recommend you: git commit
+```
+
+Thank you for any hint.
+
+"""]]
diff --git a/doc/install/OSX/Homebrew/comment_1_61cad5a309c3c4e3f278dec1890c9f40._comment b/doc/install/OSX/Homebrew/comment_1_61cad5a309c3c4e3f278dec1890c9f40._comment
new file mode 100644
index 000000000..75217e851
--- /dev/null
+++ b/doc/install/OSX/Homebrew/comment_1_61cad5a309c3c4e3f278dec1890c9f40._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="IgorGanapolsky"
+ avatar="http://cdn.libravatar.org/avatar/6bc0985e3dedceb150f08ad6456c84b2"
+ subject="Cannot install c2hs"
+ date="2016-10-24T18:05:51Z"
+ content="""
+When I run the following command: **cabal install c2hs --bindir=$HOME/bin**
+
+I get the following error:
+
+Error: some packages failed to install: c2hs-0.28.1 depends on language-c-0.5.0 which failed to install. language-c-0.5.0 failed during the configure step. The exception was: ExitFailure 1
+"""]]