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

10 files changed, 116 insertions, 10 deletions

diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn
index 14d9242d1..477e89528 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn
@@ -75,15 +75,15 @@ ok
 
 # Question:
 
-cat /etc/xdg/autostart/git-annex.desktop
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Git Annex Assistant
-Comment=Autostart
-Terminal=false
-Exec=/usr/bin/git-annex assistant --autostart
-Categories=
+    cat /etc/xdg/autostart/git-annex.desktop
+    [Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=Git Annex Assistant
+    Comment=Autostart
+    Terminal=false
+    Exec=/usr/bin/git-annex assistant --autostart
+    Categories=
 
 Should there be a git-annex process whenever I log in even if I don't launch the webapp ?
 I can check that on next login.
diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_1_7508685b6f676c72e316642b80e40ee8._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_1_7508685b6f676c72e316642b80e40ee8._comment
index e92e1b100..e92e1b100 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_1_7508685b6f676c72e316642b80e40ee8._comment
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_1_7508685b6f676c72e316642b80e40ee8._comment
diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_2_c4dd12ea578d1f07464e1b9d68ec96cf._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_2_c4dd12ea578d1f07464e1b9d68ec96cf._comment
index a94d0c13a..a94d0c13a 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_2_c4dd12ea578d1f07464e1b9d68ec96cf._comment
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_2_c4dd12ea578d1f07464e1b9d68ec96cf._comment
diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_3_8687c1d1c44d88a8ac13208273565d6c._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_3_8687c1d1c44d88a8ac13208273565d6c._comment
index 4e497e240..4e497e240 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_3_8687c1d1c44d88a8ac13208273565d6c._comment
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_3_8687c1d1c44d88a8ac13208273565d6c._comment
diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_4_62be3dd4092b15cdf85cf9a231b2863a._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_4_62be3dd4092b15cdf85cf9a231b2863a._comment
index 748b57df5..748b57df5 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_4_62be3dd4092b15cdf85cf9a231b2863a._comment
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_4_62be3dd4092b15cdf85cf9a231b2863a._comment
diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_5_cca4905426a3e01da6e12be855c7a418._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_5_cca4905426a3e01da6e12be855c7a418._comment
index 50b6e5dfa..50b6e5dfa 100644
--- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup/comment_5_cca4905426a3e01da6e12be855c7a418._comment
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_5_cca4905426a3e01da6e12be855c7a418._comment
diff --git a/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_6_ae2ca07169321c4a51b7e8e581fda5e2._comment b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_6_ae2ca07169321c4a51b7e8e581fda5e2._comment
new file mode 100644
index 000000000..6349de01e
--- /dev/null
+++ b/doc/bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__/comment_6_ae2ca07169321c4a51b7e8e581fda5e2._comment
@@ -0,0 +1,72 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY"
+ nickname="Stéphane"
+ subject="Cconfirmed it was a LXDE issue, now fixed."
+ date="2014-07-03T09:58:24Z"
+ content="""
+Since this is a little strange, I just looked again at the machine.
+Your software attracts archivist kind of git-annex user, so don't be surprise that I kept logs of the machine.
+
+Short answer: **confirmed it was a LXDE issue, now fixed**.
+
+## From what date has git-annex started to work ?
+
+	git log | grep Date:
+
+    (many other lines...)
+    Date:   Mon Jun 30 21:43:49 2014 +0200
+    Date:   Mon Jun 30 21:42:07 2014 +0200
+    Date:   Mon Jun 30 21:38:22 2014 +0200
+    Date:   Sun Jun 8 14:34:13 2014 +0200
+    Date:   Sun Jun 8 14:28:48 2014 +0200
+    Date:   Sat Jun 7 16:21:06 2014 +0200
+
+So I tried to enable it on June 7, reported bug on June 8.
+The the machine was used on a regular basis but git-annex assistant was ineffective.
+Then it started working as expected from June 30th.
+
+## Any package install near June 30th ?
+
+Updates installed regularly.
+
+    cd /var/log ; zgrep -h \" installed.*\" dpkg.log* | grep '2014-0[67]-..' -o | sort | uniq -c
+
+          2 2014-06-02
+          3 2014-06-03
+          3 2014-06-04
+          3 2014-06-06
+         49 2014-06-07
+          3 2014-06-10
+          8 2014-06-11
+         45 2014-06-12
+          7 2014-06-13
+          2 2014-06-16
+         42 2014-06-21
+         20 2014-06-25
+          3 2014-06-26
+         23 2014-06-27
+         13 2014-06-28
+          6 2014-06-30
+         15 2014-07-02
+          3 2014-07-03
+
+Which packages were installed on 2014-06-30 ?
+
+    cd /var/log ; zgrep -h \" installed.*\" dpkg.log* | grep '2014-06-(29|30)' -E
+
+    2014-06-30 17:29:15 status installed lxsession-data:all 0.4.9.2+git20140410-0ubuntu1.1
+    2014-06-30 17:29:29 status installed desktop-file-utils:i386 0.22-1ubuntu1
+    2014-06-30 17:29:30 status installed mime-support:all 3.54ubuntu1
+    2014-06-30 17:29:30 status installed lxsession-default-apps:i386 0.4.9.2+git20140410-0ubuntu1.1
+    2014-06-30 17:29:44 status installed lxsession-logout:i386 0.4.9.2+git20140410-0ubuntu1.1
+    2014-06-30 17:29:58 status installed lxsession:i386 0.4.9.2+git20140410-0ubuntu1.1
+
+And indeed [0.4.9.2+git20140410-0ubuntu1.1 : “lxsession” package : Ubuntu](https://launchpad.net/ubuntu/+source/lxsession/0.4.9.2+git20140410-0ubuntu1.1)
+
+So it was indeed a lxde bug.
+
+[Diff text](http://launchpadlibrarian.net/177201602/lxsession_0.4.9.2%2Bgit20140410-0ubuntu1_0.4.9.2%2Bgit20140410-0ubuntu1.1.diff.gz)
+
+I added a comment there (#69) which may serve as a hint to other people having not updated their system. [Bug #1308348 “network settings indicator missing from panel” : Bugs : “lxsession” package : Ubuntu](https://bugs.launchpad.net/ubuntu/+source/lxsession/+bug/1308348)
+
+"""]]
diff --git a/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn b/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn
new file mode 100644
index 000000000..8692b93b6
--- /dev/null
+++ b/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn
@@ -0,0 +1,14 @@
+### Please describe the problem.
+
+When I `git mv` a file that I just `git annex add`-ed without having `git commit`-ed it first, then the symlink will break.
+
+### What steps will reproduce the problem?
+
+    $ mkdir foo
+    $ echo hello > foo/bar
+    $ git annex add foo/bar
+    $ git mv foo/bar .
+
+### What version of git-annex are you using? On what operating system?
+
+5.20140529 on Debian testing
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index 246ef10b5..0df0811d5 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
 Help me prioritize my work: What special remote would you most like
 to use with the git-annex assistant?
 
-[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 73 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 11 "OpenStack SWIFT" 34 "Google Drive"]]
+[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 73 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 12 "OpenStack SWIFT" 34 "Google Drive"]]
 
 This poll is ordered with the options I consider easiest to build
 listed first. Mostly because git-annex already supports them and they
diff --git a/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__.mdwn b/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__.mdwn
new file mode 100644
index 000000000..76f03452d
--- /dev/null
+++ b/doc/forum/use_case:_unique_indentifier_of_objets___40__doi_like__41__.mdwn
@@ -0,0 +1,20 @@
+Dear all,
+           From some time now I am wondering about a way to index a set of files, lets say PDF documents. The idea is to have a unique identifier for each file and to cross-reference using this identifier. For instance, I use a project management (PM) software (web based) on a public server of my university. Then I have a set of tasks saying, review document X, or Y. And those documents are stored on an internal server of my lab.
+I see several options:
+
+1. Upload the required documents to the PM site and directly link
+2. Share online my internal server and use the URL of the docs in the PM
+3. Just use the unique identifier in the PM, and then look in git annex for that ID
+4. Use some sort of document management system (DMS)
+
+Options 1 and 2 are impractical for several reasons. Option 4 usually requires that your files are inside the DMS.
+So my questions are: 
+
+* Do you think this is doable with git-annex?
+* Is there an easy way to ask it: give me the document with this index?
+* I think the best answer for this question is: git annex find --include '*' --format='${key} ${file}' | grep <KEY>
+* And conversely, how do I find the key of a certain document?
+
+Thanks in advance.
+Best,
+       Juan