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

doc/bugs/Build-depends_needs___39__hxt__39___added_-_3.20121127.mdwn

@@ -0,0 +1,35 @@
+What steps will reproduce the problem?
+
+Install git-annex via cabal - either from Hackage or as a manual install.  (i.e. <http://git-annex.branchable.com/install/cabal/>)
+
+What is the expected output? What do you see instead?
+
+Expect a clean install.
+
+However, get the following error:
+
+    Assistant/Install.hs:24:8:
+        Could not find module `Data.AssocList'
+        It is a member of the hidden package `hxt-9.3.1.1'.
+        Perhaps you need to add `hxt' to the build-depends in your .cabal file.
+        Use -v to see a list of the files searched for.
+
+
+What version of git-annex are you using? On what operating system?
+
+git-annex: 3.20121127
+OS: Mac OSX 10.6.8
+
+Please provide any additional information below.
+
+The fix seems to be as simple as adding 'htx' to the 'git-annex.cabal' file:
+
+    Executable git-annex
+      Main-Is: git-annex.hs
+      Build-Depends: MissingH, hslogger, directory, filepath,
+       unix, containers, utf8-string, network (>= 2.0), mtl (>= 2.1.1),
+       bytestring, old-locale, time,
+       -- Added htx here
+       hxt,
+       pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
+

doc/bugs/Need_to_manually_install_c2hs_-_3.20121127_and_previous.mdwn

@@ -0,0 +1,33 @@
+What steps will reproduce the problem?
+
+Install git-annex via cabal - either from Hackage or as a manual install. (i.e. <http://git-annex.branchable.com/install/cabal/>)
+
+What is the expected output? What do you see instead?
+
+Expect a clean install.
+
+However, get the following error:
+
+      Configuring gnuidn-0.2...
+      cabal: The program c2hs is required but it could not be found.
+      Failed to install gnuidn-0.2
+      cabal: Error: some packages failed to install:
+      git-annex-3.20121127 depends on gnuidn-0.2 which failed to install.
+      gnuidn-0.2 failed during the configure step. The exception was:
+      ExitFailure 1
+      network-protocol-xmpp-0.4.4 depends on gnuidn-0.2 which failed to install.
+
+What version of git-annex are you using? On what operating system?
+
+git-annex: 3.20121127 (and previous versions)
+
+OS: Mac OSX 10.6.8
+
+
+Please provide any additional information below.
+
+The fix seems as easy as
+
+    cabal install c2hs
+
+Should c2hs be included as a dep got git-annex or is this a bug in gnuidn?

doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__/comment_1_0da9fd67c3cc01b316f95a1df4eb62ae._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="Could not find module `Data.AssocList' confirmed fixed."
+ date="2012-11-28T03:38:19Z"
+ content="""
+builds fine now, thank you!
+"""]]

doc/forum/How_to_restore_symlinks/comment_3_4ff80729787a2a4e2baf05dd1db37da3._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="jbee"
+ ip="178.25.68.205"
+ subject="Thanks"
+ date="2012-11-28T11:52:24Z"
+ content="""
+> deletion has been committed to git, and then you'd use git log --stat to find the commit that deleted your files, and git revert could be used to undo it.
+
+That did the trick.
+
+Thanks Joey, for the answer and the magnificence that is git-annex.
+"""]]

doc/forum/Moving_large_files_within_the_repo_without_copying___63__.mdwn

@@ -0,0 +1,19 @@
+Is there a way to move a large file without "git annex unlock"ing it (Which takes very long for copying and then rehashing the file)?
+Using a simple "mv" or "git mv" results in broken symlinks, if the target directory is on a different hierarchy level:
+
+Example:
+
+Initial State:
+
+    $ ls -Hl Pictures:
+    Pictures/showImages.jpg -> ../.git/annex/objects/90/32/SHA1-s8737--a8bfb285d0ae394cb75c86f1eb9f703fb678a51e/SHA1-s8737--a8bfb285d0ae394cb
+
+Move: 
+
+    $ mv Pictures/showImages.jpg .
+
+Result: 
+
+    $ ls -H showImages.jpg
+    ls: cannot access showImages.jpg: No such file or directory
+    

doc/forum/Moving_large_files_within_the_repo_without_copying___63__/comment_1_9e3290138133d5a23a80f72342f47ec4._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM"
+ nickname="Karsten"
+ subject="comment 1"
+ date="2012-11-28T13:28:21Z"
+ content="""
+Just commit, git-annex will fix the symlinks. Or do it manually with 'git annex fix'.
+"""]]

doc/forum/Moving_large_files_within_the_repo_without_copying___63__/comment_2_232b77894dda51d02cbc34bd25d3213b._comment

@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0"
+ nickname="Sehr"
+ subject="Does not work"
+ date="2012-11-28T14:50:16Z"
+ content="""
+    $ git annex fix 
+
+Does not change anything. and
+
+    $ git annex fix showImages.jpg
+    git-annex: showImages.jpg not found
+"""]]

doc/forum/Moving_large_files_within_the_repo_without_copying___63__/comment_3_d35ac1bdb3fa6e303ad92348ba174158._comment

@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM"
+ nickname="Karsten"
+ subject="comment 3"
+ date="2012-11-28T15:03:42Z"
+ content="""
+In my tests 'git annex fix' works only on symlinks in directories alredy known to git. So if you created a new directory inside your annex, be sure to 'git add' the directory before running 'git annex fix'.
+
+HTH,
+Karsten
+"""]]

doc/forum/Moving_large_files_within_the_repo_without_copying___63__/comment_4_4b443ec6b47eaabe214d0c2222083e4a._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0"
+ nickname="Sehr"
+ subject="comment 4"
+ date="2012-11-28T15:14:49Z"
+ content="""
+Thanks. It seems that the file itself has to be added to git annex to be able to bet git annex fixed!
+"""]]

doc/forum/Synchronize_large_files___40__VM_images__41__.mdwn

@@ -0,0 +1,10 @@
+Hi, 
+
+i'm thinking to use git-annex to synchronize my virtual machine directory (Virtualbox) between 3 pc. It's quite big: more than 200GB and some of the images are 40Gb in size.
+
+The synchronization will be over a lan (obviously). It is already in place with 2pc and unison but the configuration of the 3rd pc is cumbersome. 
+Does anybody have experiences with git-annex and such amount of data?
+
+Thanks in advance
+
+Gabriele

doc/forum/benefit_of_splitting_a_repository.mdwn

@@ -0,0 +1,10 @@
+I am evaluating the best strategy to use git-annex to manage my media library. It consists of about 300.000 files totaling 1 TB of data.
+
+My question is, wheither it would be of advantage to split the repo into several smaller ones (Like Photos, Videos, Musik, Books, ...)?
+
+Would this affect performance of certain operations? I.e. Operations that have superlinear (O(n^a) with a > 1) complexity?
+
+I am thinking about "git annex unused", which takes 22 minutes on my machine performed on the full repo. 
+
+
+Do you have more interesting information on using git-annex in this scale?