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

doc/bugs/encfs_accused_of_being_crippled.mdwn

@@ -0,0 +1,39 @@
+### Please describe the problem.
+
+I tried to create an annex (``git annex init foo``) inside a ``encfs`` mount, and git-annex says that it's crippled, and disables core.symlinks and goes into direct mode
+
+### What steps will reproduce the problem?
+
+    apt-get install encfs
+    encfs -o kernel_cache empty_dir other_empty_dir
+    cd other_empty_dir
+    git init
+    git annex init foo
+
+### Expected results
+
+    init foo ok
+    (Recording state in git...)
+
+### Actual results
+
+    init foo 
+      Detected a crippled filesystem.
+
+      Disabling core.symlinks.
+
+      Enabling direct mode.
+    ok
+    (Recording state in git...)
+
+### What version of git-annex are you using? On what operating system?
+
+4.20130601 on debian unstable
+
+
+### P.S.
+
+This was particularly annoying when I tried this on a bare repository. I'm pretty sure bare repositories don't need symlinks, and should definitely not be in direct mode. Hopefully you can fix it before I have time to file another bug report :)
+
+Thank you!
+

doc/forum/performance_and_multiple_replication_problems.mdwn

@@ -0,0 +1,17 @@
+Hi,
+
+I just was setting um my git-annex repository and started to sync my whole stuff in it.
+
+Background: I have choosen git-annex to sync my whole stuff (pictures, mp3s, documents, etc) between my pc, notebook and a home-server
+
+My Problems:
+1) When I'm starting the git-annex deamon, the "Performing startup scan" message occurs for hours
+2) git-annex synchronizes folders from the server which already on my pc, and that every time I restart the deamon on client
+
+My Questions:
+For 1) is git-annex when running one repository suitable to manage > 100gb and > 50000 files?
+For 2) do I have to wait until every tasks are completed (everything is committed) to get rid of multiple downloads of the same folders/files
+3) what is the best schema to sync between >2 devices should I use a Mesh or Star Schema (where my server is in the middle)
+
+Thank You in advance!
+Regards J

doc/install/OSX/comment_20_3e6a3c00444badf2cf7a9ee3d54af11e._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnEgT3Gxm4AAK4zu3ft5-PsUmY6dr1F-gE"
+ nickname="David"
+ subject="OSX app bundle"
+ date="2013-06-05T17:35:49Z"
+ content="""
+I'm using the annex assistant from the annex bundle for the convenience, but sometimes I use git-annex directly from the command line. I have /Applications/git-annex.app/Contents/MacOS/ in my path, but is there any way you could build the app bundle with the manpage in there so I could add it to my MANPATH?  
+"""]]

doc/tips/flickrannex/comment_2_d74c4fc7edf8e47f7482564ce0ef4d12._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="develop"
+ subject="comment 2"
+ date="2013-06-05T21:33:42Z"
+ content="""
+Get the statically linked version from here http://git-annex.branchable.com/install/Linux_standalone/
+
+I believe the new hook format was introduced in version 4.20130521
+"""]]

doc/tips/flickrannex/comment_2_f53d0d5520e2835e9705bea4e75556f0._comment

@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="missing configuration for flickr-checkpresent-hook"
+ date="2013-06-05T20:44:25Z"
+ content="""
+<https://github.com/TobiasTheViking/flickrannex/issues/3>
+
+9 days ago: [the annex] \"hook format a few versions ago, and this is using the new hook format\".
+
+Looks very handy. I am just starting with this, but can't seem to get it working as a remote after following the simple walkthrough. All goes well until:
+
+    $ git annex copy . --to flickr
+    copy walkthrough.sh (checking flickr...) 
+      missing configuration for flickr-checkpresent-hook
+    git-annex: checkpresent hook misconfigured
+
+my Ubuntu 12.04:
+
+    $ git annex version
+    git-annex version: 4.20130516.1
+    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3 4
+    upgrade supported from repository versions: 0 1 2
+
+I guess my \"git-annex version is still too old\"? Any idea what version is needed? Even better if I can figure out which Linux distribution/release has the most up to date version of annex.
+
+"""]]

doc/tips/flickrannex/comment_4_9ebba4d61140f6c2071e988c9328cf7e._comment

@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="develop"
+ subject="comment 4"
+ date="2013-06-05T22:02:29Z"
+ content="""
+The path for the binary \"/usr/bin/python2\" is wrong.
+
+It could be any of /usr/bin/python /usr/bin/python2.6 /usr/bin/python2.7
+
+Or maybe in /usr/local/bin
+
+you can try running \"which python\" or \"which python2\" to get the real path.
+"""]]

doc/tips/flickrannex/comment_5_4470dae270613dd8712623474bc80ab0._comment

@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="missing configuration for flickr-checkpresent-hook"
+ date="2013-06-05T22:00:48Z"
+ content="""
+Many thanks.
+
+I used gitannex-install and was left with a slight anomaly:
+
+    Installing...........done
+    git-annex version 4.20130601 has been installed
+    $ git-annex version
+    git-annex version: 4.20130531-g5df09b5
+
+But I guess this includes the new hook format.  I get a bit further:
+
+    $ git annex copy . --to flickr
+    copy walkthrough.sh (checking flickr...) (user error (sh [\"-c\",\"/usr/bin/python2 /home/nrb/repos/gits/flickrannex/flickrannex.py\"] exited 1)) failed
+    copy walkthrough.sh~ (checking flickr...) (user error (sh [\"-c\",\"/usr/bin/python2 /home/nrb/repos/gits/flickrannex/flickrannex.py\"] exited 1)) failed
+    git-annex: copy: 2 failed
+
+
+"""]]