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

8 files changed, 112 insertions, 0 deletions

diff --git a/doc/bugs/Can__39__t_initialize_Tahoe_special_remote/comment_4_499d68e03431a8bd88405dc86bc92b84._comment b/doc/bugs/Can__39__t_initialize_Tahoe_special_remote/comment_4_499d68e03431a8bd88405dc86bc92b84._comment
new file mode 100644
index 000000000..e1578dac3
--- /dev/null
+++ b/doc/bugs/Can__39__t_initialize_Tahoe_special_remote/comment_4_499d68e03431a8bd88405dc86bc92b84._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="shidash@f577ed77e11dcfd714258ba6b25aaf670515222b"
+ nickname="shidash"
+ subject="comment 4"
+ date="2015-06-05T12:25:01Z"
+ content="""
+Yeah, I'm using tahoe-lafs version 1.9.2
+"""]]
diff --git a/doc/forum/renaming_directories_not_supported__63__.mdwn b/doc/forum/renaming_directories_not_supported__63__.mdwn
new file mode 100644
index 000000000..42df24051
--- /dev/null
+++ b/doc/forum/renaming_directories_not_supported__63__.mdwn
@@ -0,0 +1,45 @@
+I have an annex repository with several of my CDs. They were ripped using MusicBrainz data, causing some directory names to be in Russian. This is something I wanted to change.
+
+I have cloned this repository on my laptop, where I wanted to implement the change.
+
+When I do a git mv Пётр_Ильич_Чайковский P_I_Tchaikovsky on my laptop, I can commit the change. git annex sync also doesn't object
+
+However, the original directory remains on the origin repository, and the renamed directory is not present.
+
+Am I doing something wrong?
+
+
+
+    [master e112a02] Renamed Tchaikovsky directory.
+     9 files changed, 0 insertions(+), 0 deletions(-)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/04 Variations on a Rococo Theme, Op. 33_ Moderato quasi Andante.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/04 Variations on a Rococo Theme, Op. 33_ Moderato quasi Andante.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/05 Variations on a Rococo Theme, Op. 33_ Tema. Moderato semplice.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/05 Variations on a Rococo Theme, Op. 33_ Tema. Moderato semplice.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/06 Variations on a Rococo Theme, Op. 33_ Variazione I. Tempo del Tema.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/06 Variations on a Rococo Theme, Op. 33_ Variazione I. Tempo del Tema.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/07 Variations on a Rococo Theme, Op. 33_ Variazione II. Tempo del Tema.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/07 Variations on a Rococo Theme, Op. 33_ Variazione II. Tempo del Tema.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/08 Variations on a Rococo Theme, Op. 33_ Variazione III. Andante sostenuto.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/08 Variations on a Rococo Theme, Op. 33_ Variazione III. Andante sostenuto.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/09 Variations on a Rococo Theme, Op. 33_ Variazione IV. Andante grazioso.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/09 Variations on a Rococo Theme, Op. 33_ Variazione IV. Andante grazioso.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/10 Variations on a Rococo Theme, Op.,33_ Variazione V. Allegro moderato.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/10 Variations on a Rococo Theme, Op.,33_ Variazione V. Allegro moderato.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/11 Variations on a Rococo Theme, Op. 33_ Variazione VI. Andante.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/11 Variations on a Rococo Theme, Op. 33_ Variazione VI. Andante.flac" (100%)
+     rename "\320\237\321\221\321\202\321\200_\320\230\320\273\321\214\320\270\321\207_\320\247\320\260\320\271\320\272\320\276\320\262\321\201\320\272\320\270\320\271/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/12 Variations on a Rococo Theme, Op. 33_ Variazione VII e Coda. Allegro vivo.flac" => "P_I_Tchaikovsky/Dvo\305\231\303\241k_ Cellokonzert _ Tschaikowsky_ Rokoko-Variationen/12 Variations on a Rococo Theme, Op. 33_ Variazione VII e Coda. Allegro vivo.flac" (100%)
+    frederik@freo:~/Music$ git annex sync
+    commit  ok
+    pull A20 
+    remote: Counting objects: 83, done.
+    remote: Compressing objects: 100% (74/74), done.
+    remote: Total 83 (delta 2), reused 0 (delta 0)
+    Unpacking objects: 100% (83/83), done.
+    From ssh://A20:/mnt/usb1/Music
+       5c0bae2..72eb235  git-annex  -> A20/git-annex
+    ok
+    (merging A20/git-annex into git-annex...)
+    (Recording state in git...)
+    push A20 
+    Counting objects: 284, done.
+    Delta compression using up to 4 threads.
+    Compressing objects: 100% (257/257), done.
+    Writing objects: 100% (284/284), 21.06 KiB | 0 bytes/s, done.
+    Total 284 (delta 153), reused 0 (delta 0)
+    To ssh://A20:/mnt/usb1/Music
+       0a391ea..ad7251c  git-annex -> synced/git-annex
+       4af0061..e112a02  master -> synced/master
+    ok
diff --git a/doc/forum/renaming_directories_not_supported__63__/comment_1_94bb80e70fe619c6f1913b4a233e47ec._comment b/doc/forum/renaming_directories_not_supported__63__/comment_1_94bb80e70fe619c6f1913b4a233e47ec._comment
new file mode 100644
index 000000000..8d51caa25
--- /dev/null
+++ b/doc/forum/renaming_directories_not_supported__63__/comment_1_94bb80e70fe619c6f1913b4a233e47ec._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 1"
+ date="2015-06-05T07:21:44Z"
+ content="""
+Looks like you missed a step from your output (difficult to be sure because you don't show a full transcript showing a rename and it not being present in the other repo).
+
+Have you updated the remote repo where the changes aren't present? 'git annex sync' or 'git annex merge'?
+
+If you made the changes in repoA and ran sync there, it pushes the changes to repoB, but it can't update repoB's working directory remotely (restriction from git). You have to update it locally to see them.
+
+First few paragraphs of [sync](http://git-annex.branchable.com/sync/) mention this.
+
+So if you run sync or merge in the remote repository, you should see your changes.
+"""]]
diff --git a/doc/forum/renaming_directories_not_supported__63__/comment_2_4bd6386dbd5cb907a9c85fb240265ee5._comment b/doc/forum/renaming_directories_not_supported__63__/comment_2_4bd6386dbd5cb907a9c85fb240265ee5._comment
new file mode 100644
index 000000000..4896dd0f2
--- /dev/null
+++ b/doc/forum/renaming_directories_not_supported__63__/comment_2_4bd6386dbd5cb907a9c85fb240265ee5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a"
+ nickname="frederik"
+ subject="comment 2"
+ date="2015-06-05T07:41:55Z"
+ content="""
+Thanks, I had missed that part.
+"""]]
diff --git a/doc/publicrepos.mdwn b/doc/publicrepos.mdwn
index 14645528d..47f3e5c1e 100644
--- a/doc/publicrepos.mdwn
+++ b/doc/publicrepos.mdwn
@@ -28,5 +28,10 @@ the public repositories that you can clone to try out git-annex.
 * [gst-integration-testsuites](http://cgit.freedesktop.org/gstreamer/gst-integration-testsuites)  
   GStreamer integration testsuite media assets management
 
+* [ccc-media-annex](https://github.com/ntnn/ccc-media-annex)  
+  `git clone https://github.com/ntnn/ccc-media-annex`  
+  git-annex repository using [the CDN](http://cdn.media.ccc.de/) of the german [CCC](http://www.ccc.de/).  
+  Contains a lot of talks (mostly in german) held on events from the CCC as well as other stuff.
+
 This is a wiki -- add your own public repository to the list!
 See [[tips/centralized_git_repository_tutorial]].
diff --git a/doc/special_remotes/tahoe/comment_3_8a425ab612c3b46efb9658ab79038661._comment b/doc/special_remotes/tahoe/comment_3_8a425ab612c3b46efb9658ab79038661._comment
new file mode 100644
index 000000000..63c9bc532
--- /dev/null
+++ b/doc/special_remotes/tahoe/comment_3_8a425ab612c3b46efb9658ab79038661._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="junk@5e3eeba2290e8a3fcf938d9f93b0dfa2565dc7b1"
+ nickname="junk"
+ subject="Tahoe-LAFS helper: multiple FURLs for the same grid"
+ date="2015-06-05T09:19:19Z"
+ content="""
+Hi Joey,
+
+thank you very much for your reply! 
+
+I've continued to wrap my head around this because it does not seem to be the intended way to do it in git-annex and also the helper is still in development (it only works for uploads so far). Right now I've figured out that I could also add two rsync-remote with the same uuid and have csync2 sync the two servers. This way I could use which ever remote is closest to upload and download my files and csync will make sure that the files end up on all remotes. So in my case this would achieve the same as the Tahoe-LAFS solution but use more of git-annexes fetures then of Tahoe-LAFS. Also I will be able to easily delete files from the git.
+
+I'll keep you posted on how it went.
+
+Best regards,
+
+Oliver
+"""]]
diff --git a/doc/todo/git-annex_metadata_extractor_progress_bar.mdwn b/doc/todo/git-annex_metadata_extractor_progress_bar.mdwn
new file mode 100644
index 000000000..599e386ca
--- /dev/null
+++ b/doc/todo/git-annex_metadata_extractor_progress_bar.mdwn
@@ -0,0 +1,3 @@
+it can take a significant amount of time for the [[automatic metadata script|tips/automatically_adding_metadata/]] to run on commit. it would be nice to have some progress, otherwise it just looks like the command is hanging.
+
+here it's been processing my photos for more than three hours, and it's probably not even halfway done, according to ps... [[anarcat]]
diff --git a/doc/users/candyangel.mdwn b/doc/users/candyangel.mdwn
new file mode 100644
index 000000000..4c9aedadc
--- /dev/null
+++ b/doc/users/candyangel.mdwn
@@ -0,0 +1,10 @@
+I hang out in #git-annex on OFTC (come and chat/ask for help).
+
+[Getting mentioned by Joey](http://git-annex.branchable.com/devblog/day_277__thanks/) is definitely a (if not **the**) highlight of my involvement in the git-annex community. That really made my month!
+
+Things that I am (or plan to) work on related to git-annex (in some way):
+* FUSE filesystem for dynamic get/drop of content
+* FUSE filesystem for metadata change/views (like tagsistant)
+* Patchset for ikiwiki which allows it to be used with perlbrew libs
+* Support for modifying git-annex metadata in my file sorting app
+* Support for git-annex in my VR environment