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

22 files changed, 181 insertions, 75 deletions

diff --git a/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_2_0ede40e0d68bfb9c6dbc1777f944ed06._comment b/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_2_0ede40e0d68bfb9c6dbc1777f944ed06._comment
new file mode 100644
index 000000000..066fefa0c
--- /dev/null
+++ b/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_2_0ede40e0d68bfb9c6dbc1777f944ed06._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 2"
+ date="2014-05-17T14:16:12Z"
+ content="""
+One follow-up comment, because it occurred to me I might have phrased
+the bug inadequately. By «revert» I didn’t mean a revert in the
+git-sense, but merely «checking out» a file from a selected commit.
+
+But I think I can achieve this in direct mode on VFAT by doing «git
+show upstream/branch~X:file > file», right? «git annex get file» then
+gets the correct content, only that it will not place the content into
+the indicated file until I do «git annex fsck». Maybe «git annex get»
+could take this into account and have the content immediately stored
+there.
+
+"""]]
diff --git a/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_3_4ce1601f5dbd8fb769d3c5bb429c3bc5._comment b/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_3_4ce1601f5dbd8fb769d3c5bb429c3bc5._comment
new file mode 100644
index 000000000..6e5db42d0
--- /dev/null
+++ b/doc/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/comment_3_4ce1601f5dbd8fb769d3c5bb429c3bc5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 3"
+ date="2014-05-17T14:21:30Z"
+ content="""
+Plus it seems that the file can’t be dropped normally afterwards.
+"""]]
diff --git a/doc/forum/Distributing_data_to_a_set_of_drives/comment_2_e13b4e5c1e6f1f503f93d521b504d5c1._comment b/doc/forum/Distributing_data_to_a_set_of_drives/comment_2_e13b4e5c1e6f1f503f93d521b504d5c1._comment
new file mode 100644
index 000000000..5843ab177
--- /dev/null
+++ b/doc/forum/Distributing_data_to_a_set_of_drives/comment_2_e13b4e5c1e6f1f503f93d521b504d5c1._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="216.145.95.162"
+ subject="comment 2"
+ date="2014-05-17T17:00:19Z"
+ content="""
+git-annex doesn't allow bonding repositories like that, but it does have repository groups which can accomplish the same thing.
+
+For example, if you put B C and D into the archive group, and set the [[preferred_content]] expression to \"standard\", then each repository will only want files that have not yet reached some other archive repository.
+
+Or, you can make up your own group name, like \"BCD\" and set the preferred content of each repository to something like \"not (copies=BCD:2)\"  -- and now it will try to have 2 copies of each file on one of the drives.
+
+Once it's configured, using either the git-annex assistant, or `git annex sync --content` will copy files around according to the configuration.
+
+This will tend to fill up the first drive, or the first 2 drives, and only use subsequent drives if files don't fit on the first drive. You can use [[cost]] settings to control which drives files are put on.
+"""]]
diff --git a/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive.mdwn b/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive.mdwn
new file mode 100644
index 000000000..20e435fcf
--- /dev/null
+++ b/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive.mdwn
@@ -0,0 +1,3 @@
+I'm using Git Annex Assistant for the first time, trying to get it to mirror a directory of files from my computer to an external USB drive. I've tried setting up the second repo as a "Removable Drive" in the "full backup" repository group. I've also tried putting it in the "client" group. The result is the same, and Assistant doesn't backup any of my files to the external drive.
+
+What I get in the external drive in the directory that should contain the repo are the set of files "annex, objects, refs, config, HEAD" and they are NOT in a .git subdirectory. Aside from this I don't see any of the files Git Annex Assistant says it has synced. As this is my first time using the Assistant, I don't know if this is a bug, or if I'm just using it incorrectly. If anyone knows what is going on here, please share.
diff --git a/doc/forum/Special_remote_public_key_encryption_issue/comment_2_adfa582d611ca501e21110282df07315._comment b/doc/forum/Special_remote_public_key_encryption_issue/comment_2_adfa582d611ca501e21110282df07315._comment
new file mode 100644
index 000000000..8e2753530
--- /dev/null
+++ b/doc/forum/Special_remote_public_key_encryption_issue/comment_2_adfa582d611ca501e21110282df07315._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="hyperio"
+ ip="62.31.92.216"
+ subject="Still not working"
+ date="2014-05-17T12:22:17Z"
+ content="""
+Thank you for your reply. I copied over the public key from computer 2 to computer 1 and tried to add it using git annex enableremote box.com keyid+=[keyid]. I am then asked for the passphrase for my private key on computer 1. Afterwards I am asked for the passphrase for the private key on computer 2... why? Obviously I don't have it so I get 
+
+gpg: can't query passphrase in batch mode
+gpg: decryption failed: secret key not available
+
+git-annex: user error (gpg [\"--quiet\",\"--trust-model\",\"always\",\"--batch\",\"--decrypt\"] exited 2)
+
+Why would I need computer 2's secret key? Or I might just get it completely wrong.
+Also, can the passphrase be remembered somewhere, so that I can use the assistant? (otherwise I think it won't work, because I would have to type the passphrase at every synchronisation attempt).
+
+Sorry for my confusion, thanks for your support.
+"""]]
diff --git a/doc/forum/Special_remote_public_key_encryption_issue/comment_3_eac16bf98a6e87461ba2f3ab7e990b2b._comment b/doc/forum/Special_remote_public_key_encryption_issue/comment_3_eac16bf98a6e87461ba2f3ab7e990b2b._comment
new file mode 100644
index 000000000..692b307b1
--- /dev/null
+++ b/doc/forum/Special_remote_public_key_encryption_issue/comment_3_eac16bf98a6e87461ba2f3ab7e990b2b._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="216.145.95.162"
+ subject="comment 3"
+ date="2014-05-17T17:02:15Z"
+ content="""
+I dont think it's possible for gpg to prompt for a passphrase when all it has is a public key, so I think you copied the private key too.
+
+gpg agents can cache your passphrase.
+"""]]
diff --git a/doc/forum/Special_remote_public_key_encryption_issue/comment_6_097f52aaf178340b3abb5bfc80f0d447._comment b/doc/forum/Special_remote_public_key_encryption_issue/comment_6_097f52aaf178340b3abb5bfc80f0d447._comment
new file mode 100644
index 000000000..93fa8b5b9
--- /dev/null
+++ b/doc/forum/Special_remote_public_key_encryption_issue/comment_6_097f52aaf178340b3abb5bfc80f0d447._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="hyperio"
+ ip="62.31.92.216"
+ subject="Still not working"
+ date="2014-05-17T17:25:39Z"
+ content="""
+I exported the public key on computer 2 with gpg --armor --export [keyid] and just imported it on computer 1...
+"""]]
diff --git a/doc/forum/Storing_git_repos_in_git-annex/comment_3_3bec1f02ff1a61791e3cbb428c7acb4c._comment b/doc/forum/Storing_git_repos_in_git-annex/comment_3_3bec1f02ff1a61791e3cbb428c7acb4c._comment
new file mode 100644
index 000000000..69da79a89
--- /dev/null
+++ b/doc/forum/Storing_git_repos_in_git-annex/comment_3_3bec1f02ff1a61791e3cbb428c7acb4c._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU"
+ nickname="Adam"
+ subject="comment 3"
+ date="2014-05-17T00:23:02Z"
+ content="""
+Well, like Pere, I am rather surprised by your response, Joey.  I've been an enthusiastic supporter and follower of git-annex for a long time now, and have been looking forward to using it.  I didn't expect a snarky reply...and you said yourself that it was snarky.  Maybe you had a bad day or something?  :)
+
+I don't understand why this request or idea is so controversial to you.  I have several computers, and I use git to store basic text files like shell scripts and config files--a very common situation.  I use Dropbox to sync them automatically between computers.  I could use just git, and push/pull manually, but the whole point of having computers is for them to do things for me, automatically.  The purpose of the git-annex assistant, as I understand it, is to do exactly that.  Doing the push/pull manually would be a step backwards.  And giving up manual control of the git repository, losing the ability to track changes to my files, would be a huge step backwards.
+
+This seems like it must be a very common use case among Linux users, especially ones who use the shell, git, etc.  If git-annex isn't good for this situation, what is?  Surely there's a better way than opening a shell and running \"git pull\" every time I walk from one computer to the other.
+"""]]
diff --git a/doc/forum/Storing_git_repos_in_git-annex/comment_4_76ddbd27cc2f3785bb5aaebb0bb6e087._comment b/doc/forum/Storing_git_repos_in_git-annex/comment_4_76ddbd27cc2f3785bb5aaebb0bb6e087._comment
new file mode 100644
index 000000000..9d0b024c1
--- /dev/null
+++ b/doc/forum/Storing_git_repos_in_git-annex/comment_4_76ddbd27cc2f3785bb5aaebb0bb6e087._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU"
+ nickname="Adam"
+ subject="comment 4"
+ date="2014-05-17T00:41:04Z"
+ content="""
+I should have also mentioned, the network topology is an issue that git-annex helps solve.  When my computers are on the same LAN, they could obviously sync directly with each other using git.  But when they are not on the same network, or when one of them is not online, a transfer repo is needed.  Dropbox and git-annex make this simple by handling it for me.  
+
+But if I did all my syncing with git manually, it could end up being quite a mess.  If I took my laptop with me and left the house without syncing it first, I'd have to sync with my server on the Internet.  But if I forgot to push from my desktop computer before I left, the server would be out-of-date, and I'd be stuck.
+
+Dropbox handles this for me by automatically syncing as soon as I make changes.  git-annex does the same thing, but doesn't work with nested git repos.  But giving up the nested git repo would mean giving up version control of my files.  As a developer, you understand why that's not an option!  :)
+
+Again, this seems like a very natural problem to run into, and I don't understand why it is controversial to want git-annex to handle this the way Dropbox or other sync software (e.g. SpiderOak, Wuala) can.
+"""]]
diff --git a/doc/forum/folder_size_question/comment_4_907f3b1cfe745abf94a6a8ba0dbd4396._comment b/doc/forum/folder_size_question/comment_4_907f3b1cfe745abf94a6a8ba0dbd4396._comment
new file mode 100644
index 000000000..a32e9177a
--- /dev/null
+++ b/doc/forum/folder_size_question/comment_4_907f3b1cfe745abf94a6a8ba0dbd4396._comment
@@ -0,0 +1,25 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 4"
+ date="2014-05-17T10:56:22Z"
+ content="""
+I thinks its all the small files. 
+
+    du -hs /Users/ovi/Sharing/git-annex/
+     77M	/Users/ovi/Sharing/git-annex/
+
+    du -hs /Users/ovi/Sharing/git-annex/Finance/
+     38M	/Users/ovi/Sharing/git-annex/Finance/
+
+    du -hs /Users/ovi/Sharing/git-annex/.git/
+     39M	/Users/ovi/Sharing/git-annex/.git/
+
+The GUI shows: 
+    46 136 859 bytes (80,6 MB on disk) for 8 002 items
+
+And the hidden .git folder shows:
+    7 373 616 bytes (41 MB on disk) for 7 625 items
+
+So apparently there are a lot of very small files, smaller than the blocksize hence the info is skewed? Anyway, I think its alright?
+"""]]
diff --git a/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment b/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment
deleted file mode 100644
index a03038dc8..000000000
--- a/doc/install/Debian/comment_10_d5da996e106d2e4d8a822aa9bcc78596._comment
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- nickname="joey"
- subject="comment 10"
- date="2013-05-30T19:42:05Z"
- content="""
-As of today, I have backported everything except for haskell-lens, haskell-dav, and haskell-network-protocol-xmpp. The last is the only real blocker (I can build a backport without webdav support..). 
-
-The haskell-network-protocol-xmpp in stable is actually ok, except it needs to be rebuilt against the haskell-gnutls I uploaded today. This fixes a bad segfault bug. I don't know how to handle this situation in backports TBH, and so am stuck waiting for a newer version of haskell-network-protocol-xmpp to reach testing, to get around backport's requirements that the backport version be in testing.
-
-In other words, it'll happen in 2 to 5 weeks, probably..
-"""]]
diff --git a/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment b/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment
deleted file mode 100644
index 4507f36db..000000000
--- a/doc/install/Debian/comment_11_84283676da247c401bc9b4bb12c2b453._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://hands.com/~phil/"
- nickname="hands"
- subject="comment 11"
- date="2013-05-30T19:56:07Z"
- content="""
-Fair enough -- that's more positive than I was expecting TBH -- Thanks Joey :-)
-"""]]
diff --git a/doc/install/Debian/comment_12_0aca83b055d0a9dd8589c50250a8bbea._comment b/doc/install/Debian/comment_12_0aca83b055d0a9dd8589c50250a8bbea._comment
deleted file mode 100644
index 419520c80..000000000
--- a/doc/install/Debian/comment_12_0aca83b055d0a9dd8589c50250a8bbea._comment
+++ /dev/null
@@ -1,13 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmF3Klaj8Q0Czfh1F3jaLF6issqeAhmru4"
- nickname="Keith"
- subject="Wheezy Support"
- date="2013-07-05T21:21:39Z"
- content="""
-Joey,
-
-What's the status on the wheezy backport. I'm itching to try the assistant.
-
-thanks,
-Keith
-"""]]
diff --git a/doc/install/Debian/comment_13_167a091764e5e99ec0f35a65e95a22de._comment b/doc/install/Debian/comment_13_167a091764e5e99ec0f35a65e95a22de._comment
deleted file mode 100644
index 9f05fea93..000000000
--- a/doc/install/Debian/comment_13_167a091764e5e99ec0f35a65e95a22de._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.153.254.222"
- subject="comment 13"
- date="2013-07-07T17:21:10Z"
- content="""
-I remain stuck where I was stuck previously on the backport. In the meantime, use [[Linux_standalone]] :(
-"""]]
diff --git a/doc/install/Debian/comment_16_89f67da4a4a6a626a7db9c6674b244b6._comment b/doc/install/Debian/comment_16_89f67da4a4a6a626a7db9c6674b244b6._comment
new file mode 100644
index 000000000..563be1c6c
--- /dev/null
+++ b/doc/install/Debian/comment_16_89f67da4a4a6a626a7db9c6674b244b6._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA"
+ nickname="Dominik"
+ subject="debian squeeze"
+ date="2014-05-16T22:58:52Z"
+ content="""
+I'm tring to set up a bare repo on a debian squeeze server and sync it to windows client. Unfortunately the direct mode does not seem to be available for the git-annex version (3.20120629~bpo60+2
+) in the squeeze-backports 
+
+Would you be able to update the version in that repository? Thank you for your hard work! Git-annex is awesome
+"""]]
diff --git a/doc/install/Debian/comment_17_ef7f3e88d61833e51f0302e938343818._comment b/doc/install/Debian/comment_17_ef7f3e88d61833e51f0302e938343818._comment
new file mode 100644
index 000000000..cd42becc2
--- /dev/null
+++ b/doc/install/Debian/comment_17_ef7f3e88d61833e51f0302e938343818._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="216.145.95.162"
+ subject="comment 17"
+ date="2014-05-17T17:03:31Z"
+ content="""
+Debian squeeze has an extremely ancient ghc compiler, and it would be a mammoth undertaking to build current git-annex using that. 
+
+Use the linux standalone build instead.
+"""]]
diff --git a/doc/install/Debian/comment_5_38e6399083e10a6a274f35bddc15d4ac._comment b/doc/install/Debian/comment_5_38e6399083e10a6a274f35bddc15d4ac._comment
deleted file mode 100644
index fae6c4df8..000000000
--- a/doc/install/Debian/comment_5_38e6399083e10a6a274f35bddc15d4ac._comment
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawk3eiQwrpDGJ3MJb9NWB84m4tzQ6XjVZnY"
- nickname="Allard"
- subject="wheezy support"
- date="2012-11-23T20:47:58Z"
- content="""
-Hey Joey,
-
-As a backer, I'd like to see a backport of git annex assistant to wheezy.
-
-It is currently impossible to get this assistant in wheezy without compiling it with cabal.
-
-It would be nice to see it in backports or something :)
-
-Best,
-
-Allard
-"""]]
diff --git a/doc/install/Debian/comment_6_2e7bbdbaabbfb9d89de22e913066e822._comment b/doc/install/Debian/comment_6_2e7bbdbaabbfb9d89de22e913066e822._comment
deleted file mode 100644
index c4ce6b32a..000000000
--- a/doc/install/Debian/comment_6_2e7bbdbaabbfb9d89de22e913066e822._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://svend.ciffer.net/"
- ip="2001:4978:f:52e::2"
- subject="comment 6"
- date="2012-11-23T21:38:29Z"
- content="""
-The git-annex packages in unstable install on testing (wheezy).
-"""]]
diff --git a/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment b/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment
deleted file mode 100644
index d58f294b6..000000000
--- a/doc/install/Debian/comment_9_97eaed998ffd1ed79585075ed5cff06e._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://hands.com/~phil/"
- nickname="hands"
- subject="any chance of a wheezy-backports upload?"
- date="2013-05-30T18:43:52Z"
- content="""
-I note that the instructions at the top of the page suggest that one can install the unstable version into wheezy, but as mentioned by [mey.vn](#comment-f9811cbd46471d4159d09d814ac9cf15) this is not the case with 4.20130521 (on amd64 at least) because of the libc6 version dependency.  That being the case, it would be really nice to see this in wheezy-backports as well, or would that require backporting a huge pile of haskell as well? (in which case I can see why you're not keen).
-"""]]
diff --git a/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_2_45c22f596a18d5dc2331cfeef8c767fa._comment b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_2_45c22f596a18d5dc2331cfeef8c767fa._comment
new file mode 100644
index 000000000..200210a02
--- /dev/null
+++ b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_2_45c22f596a18d5dc2331cfeef8c767fa._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 2"
+ date="2014-05-17T14:18:31Z"
+ content="""
+It occured to me that one could do something like that by «git show
+earlier-commit:file > filename». A problem with this is that a
+subsequent «get» will get the old content, but won’t put it in place
+until invoking «fsck».
+
+"""]]
diff --git a/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_3_cbca264d86fe733b8106a4bf50c0c6ff._comment b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_3_cbca264d86fe733b8106a4bf50c0c6ff._comment
new file mode 100644
index 000000000..265e0995a
--- /dev/null
+++ b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_3_cbca264d86fe733b8106a4bf50c0c6ff._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 3"
+ date="2014-05-17T14:24:20Z"
+ content="""
+Plus it seems that the file can’t be dropped normally afterwards. 
+"""]]
diff --git a/doc/todo/windows_support/comment_14_79fc0ff98c5bba2ed616e52e5a58e28f._comment b/doc/todo/windows_support/comment_14_79fc0ff98c5bba2ed616e52e5a58e28f._comment
new file mode 100644
index 000000000..9d7fb9ff0
--- /dev/null
+++ b/doc/todo/windows_support/comment_14_79fc0ff98c5bba2ed616e52e5a58e28f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA"
+ nickname="Dominik"
+ subject="multiple git-annex assistant processes"
+ date="2014-05-16T23:05:28Z"
+ content="""
+shouldn't be a problem though if all processes are spawned from the same service though, right? Or what problems did you have in mind?
+"""]]