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

17 files changed, 381 insertions, 1 deletions

diff --git a/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn b/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn
new file mode 100644
index 000000000..2bba743e4
--- /dev/null
+++ b/doc/bugs/Allow_syncing_to_a_specific_directory_on_a_USB_remote.mdwn
@@ -0,0 +1,9 @@
+This follows up to the [comment made by Laszlo](http://git-annex.branchable.com/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/#comment-f26d3b6b45bb66601ecfaa883ace161c) on the [recent poll](http://git-annex.branchable.com/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/).
+
+I too need to be able to select the directory on the remote drive that the annex will be synced to.
+
+If I just add a remote drive via the web app, it syncs the repository to `/mnt/usb/annex`, and it looks like it just creates a bare repository in that folder. I need the repository to be synced to something like `/mnt/usb/subfolder/myspecifiedfoldername` and I need that remote to be a full repository.
+
+My use case is that I use the USB drive to keep annexes in sync between two computers. I have multiple annexes that need to be synced between the two computers, and none of them are in a directory called `annex`. I also need to be able to plug the drive into other computers and access the files directly, without doing a `git clone` or anything like that. I have all of this setup and working fine with just plain old git annex, but the web app does not seem to support creating new repositories with this workflow.
+
+I think it makes a lot of sense to allow the web application to add a new remote that is simply a directory. People like me could specify the path of the directory to be on the mounted USB drive. Others may want to add a remote that is a mounted network share or something like that.
diff --git a/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn b/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn
new file mode 100644
index 000000000..4cb5df545
--- /dev/null
+++ b/doc/bugs/Creating_an_S3_repository_with_an_invalid_name_throws_an_exception.mdwn
@@ -0,0 +1,17 @@
+What steps will reproduce the problem?
+
+Attempt to create an S3 repository called 'S3 (encrypted)' via the web app.
+
+What is the expected output? What do you see instead?
+
+Expected to either accept this input, or tell me that it's invalid. Instead, I see:
+
+Internal Server Error
+user error (openTCPConnection: host lookup failure for "S3 (encrypted)-610526e6-5ce2-11e2-997e-970cbca93f19.s3.amazonaws.com")
+
+What version of git-annex are you using? On what operating system?
+
+3.20130107 On Fedora 17 (64-bit).
+
+Please provide any additional information below.
+
diff --git a/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn b/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn
new file mode 100644
index 000000000..aab03cd7f
--- /dev/null
+++ b/doc/bugs/Creating_an_encrypted_S3_does_not_check_for_presence_of_GPG.mdwn
@@ -0,0 +1,17 @@
+What steps will reproduce the problem?
+
+Don't have gpg installed/on your $PATH, and attempt to create an encrypted S3 remote via the web interface.
+
+What is the expected output? What do you see instead?
+
+Expected to be told to install GPG. Actual output was a Yesod error:
+
+Internal Server Error
+user error (gpg ["--batch","--no-tty","--use-agent","--quiet","--trust-model","always","--gen-random","--armor","1","512"] exited 127)
+
+What version of git-annex are you using? On what operating system?
+
+3.20130107 on Fedora 17 (64-bit).
+
+Please provide any additional information below.
+
diff --git a/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn
new file mode 100644
index 000000000..c2fbc98fa
--- /dev/null
+++ b/doc/bugs/Internal_server_error_adding_USB_drive_on_OS_X.mdwn
@@ -0,0 +1,21 @@
+What steps will reproduce the problem?
+
+* Start with a clean setup.
+* Allow webapp to start; use it to create annex in ~/Documents/annex That works.
+* Go to add remote repo. Removable drive.
+* Select "/Volumes/G-DRIVE slim". Click next.
+
+What is the expected output? What do you see instead?
+Expected is something like "done". What I see is
+
+Internal Server Error
+
+git config [Param "annex.uuid",Param "6898F314-7817-4CD5-B1C3-588C55522A3B"] failed
+
+What version of git-annex are you using? On what operating system?
+
+git-annex version 3.20130107, OS X Mountain Lion. No MacPorts/homebrew/fink installed. gcc / git are installed.
+
+Please provide any additional information below.
+
+Maybe something to do with the drive name having spaces? "/Volumes/git-annex" worked fine.
diff --git a/doc/bugs/No_progress_bars_with_S3.mdwn b/doc/bugs/No_progress_bars_with_S3.mdwn
new file mode 100644
index 000000000..907b3cb11
--- /dev/null
+++ b/doc/bugs/No_progress_bars_with_S3.mdwn
@@ -0,0 +1,21 @@
+## What steps will reproduce the problem?
+
+Add new data to a repository with an S3 special remote. Monitor the repository with the web app.
+
+
+## What is the expected output? What do you see instead?
+
+I expect a changing status bar and percentage. Instead I see no changes when an upload becomes active.
+
+
+## What version of git-annex are you using? On what operating system?
+
+3.20130102 on Arch 64-bit.
+
+
+## Please provide any additional information below.
+
+
+When uploading local data to an S3 remote, I see no progress bars. The progress bar area on active uploads stays the same grey as the bar on queued uploads. The status does not change from "0% of...". The uploads are completing, but this makes it very difficult to judge their activity.
+
+The only remotes I currently have setup are S3 special remotes, so I cannot say whether progress bars are working for uploads to other remote types.
diff --git a/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn b/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn
new file mode 100644
index 000000000..c4c1a8385
--- /dev/null
+++ b/doc/bugs/Switching_from_indirect_mode_to_direct_mode_breaks_duplicates.mdwn
@@ -0,0 +1,21 @@
+#What steps will reproduce the problem?
+
+1. Create a new repository in indirect mode.
+
+2. Add the same file twice under a different name. Now you have two symlinks pointing to the same file under .git/annex/objects/
+
+3. Switch to direct mode. The first symlink gets replaced by the actual file. The second stays unchanged, pointing to nowhere. But git annex whereis still reports it has a copy.
+
+4. Delete the first file. Git annex whereis still thinks it has a copy of file 2, which is not true -> data loss.
+
+#What is the expected output? What do you see instead?
+
+When switching to direct mode, both symlinks should be replaced by a copy (or at least a hardlink) of the actual file.
+
+#What version of git-annex are you using? On what operating system?
+
+3.20130107 on Arch Linux x64
+
+#Please provide any additional information below.
+
+The deduplication performed by git-annex is very dangerous in itself because files with identical content become replaced by references to the same file without the user necessarily being aware. Think of the user making a copy of a file, than modifying it. He would expect to end up with two files, the unchanged original and the modified copy. But what he really gets is two symlinks pointing to the same modified file.
diff --git a/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn b/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn
new file mode 100644
index 000000000..87831e652
--- /dev/null
+++ b/doc/bugs/Update_dependency_on_certificate___62____61___1.3.3.mdwn
@@ -0,0 +1,52 @@
+What steps will reproduce the problem?
+
+Run:
+
+    cabal install git-annex
+
+What is the expected output? What do you see instead?
+
+The current output is the following:
+
+    $ cabal install git-annex        
+    Resolving dependencies...    
+    Configuring certificate-1.3.2...
+    Building certificate-1.3.2...
+    Preprocessing library certificate-1.3.2...
+    [ 1 of 10] Compiling Data.Certificate.KeyDSA ( Data/Certificate/KeyDSA.hs, dist/build/Data/Certificate/KeyDSA.o )
+    [ 2 of 10] Compiling Data.Certificate.KeyRSA ( Data/Certificate/KeyRSA.hs, dist/build/Data/Certificate/KeyRSA.o )
+    
+    Data/Certificate/KeyRSA.hs:64:27:
+        `RSA.private_pub' is not a (visible) field of constructor `RSA.PrivateKey'
+    cabal: Error: some packages failed to install:
+    DAV-0.3 depends on certificate-1.3.2 which failed to install.
+    authenticate-1.3.2 depends on certificate-1.3.2 which failed to install.
+    certificate-1.3.2 failed during the building phase. The exception was:
+    ExitFailure 1
+    git-annex-3.20130107 depends on certificate-1.3.2 which failed to install.
+    http-conduit-1.8.6.3 depends on certificate-1.3.2 which failed to install.
+    http-reverse-proxy-0.1.1.1 depends on certificate-1.3.2 which failed to install.
+    tls-1.0.3 depends on certificate-1.3.2 which failed to install.
+    tls-extra-0.5.1 depends on certificate-1.3.2 which failed to install.
+    yesod-1.1.7.2 depends on certificate-1.3.2 which failed to install.
+    yesod-auth-1.1.3 depends on certificate-1.3.2 which failed to install.
+
+I'd rather get a message stating how awesome the software I just installed is. :)
+
+What version of git-annex are you using? On what operating system?
+
+  * Debian (testing)
+  * GHC 7.4.1
+  * Cabal 1.14.0, cabal-install 0.14.0
+  * cabal list git-annex says the installing version is: 3.20130107
+
+Please provide any additional information below.
+
+The certificate package version 1.3.2 does not seem to install properly with
+this version of GHC (I think).
+
+Version 1.3.3 solves the issue. I don't know if there is a way for me to
+override the dependency tree to try to force the version update with
+cabal-install, so maybe it's worth filing a bug.
+
+Thanks a lot for git-annex.
diff --git a/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn b/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn
new file mode 100644
index 000000000..07ac0407c
--- /dev/null
+++ b/doc/bugs/fsck_should_double-check_when_a_content-check_fails.mdwn
@@ -0,0 +1 @@
+git annex fsck marks files as bad when the checksumming fails. But this could also be due to a read error when the actual data stored is correct. So, fsck should check twice when a checksum fails.
diff --git a/doc/bugs/random_files_vanishing_when_assistant_gets_restarted.mdwn b/doc/bugs/random_files_vanishing_when_assistant_gets_restarted.mdwn
new file mode 100644
index 000000000..ecab8ed0b
--- /dev/null
+++ b/doc/bugs/random_files_vanishing_when_assistant_gets_restarted.mdwn
@@ -0,0 +1,30 @@
+#What steps will reproduce the problem?
+
+Running assistant in foreground on one repository that is paired to another repository, than killing it using CTRL-C and restarting it
+
+
+#What is the expected output? What do you see instead?
+
+I get messages like:
+
+    (Recording state in git...)
+    # Auf Zweig master
+    # Änderungen, die nicht zum Eintragen bereitgestellt sind:
+    #   (benutze "git add/rm <Datei>..." zum Bereitstellen)
+    #   (benutze "git checkout -- <Datei>..." um die Änderungen im Arbeitsverzeichnis zu verwerfen)
+    #
+    #       gelöscht:    "path/to/file"
+    #
+    keine Änderungen zum Eintragen hinzugefügt (benutze "git add" und/oder "git commit -a")
+    Total 0 (delta 0), reused 0 (delta 0)
+    To ssh://stormking@git-annex-volyova-stormking/data/repository/
+       4e2c631..911b80c  git-annex -> synced/git-annex
+    
+    Already up-to-date.
+
+Sorry for the german language, I'll try to reproduce it in english, later. After that, the symlinks for the file in the repository are gone. I can get them back by reverting the commit but things like that make me very nervous.
+
+
+#What version of git-annex are you using? On what operating system?
+
+3.20130102 on Arch Linux x64
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn b/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn
new file mode 100644
index 000000000..ac286cc18
--- /dev/null
+++ b/doc/bugs/three_way_sync_via_S3_and_Jabber.mdwn
@@ -0,0 +1,117 @@
+## What steps will reproduce the problem?
+
+I wanted to setup a `~/Desktop/annex` synchronised between three machines, my home desktop (`dagon`), my work desktop (`zakaz`) and my laptop (`hastur`).
+
+I set this up via the annex interface, using my gmail account and Amazon S3.
+
+## What is the expected output? What do you see instead?
+
+I expected that anything dropped into `~/Desktop/annex` on any of the three machines would be synced to the other 2.
+
+I ran:
+<pre>
+    $ echo Created on `hostname` > `hostname`.txt on each of the three machines.
+</pre>
+
+What I ended up with was:
+
+* Home desktop (`dagon`): dagon.txt (ok)
+* Work desktop (`zakaz`): zakaz.txt (ok) and hastur.txt (broken link)
+* Laptop (`hastur`): hastur.txt (ok) and zakaz.txt (broken link)
+
+In each case the local file had been detected and annexed -- "(ok)" means it is a symlink to the annex.
+
+Manually running `git annex sync` on any of the machines didn't change anything. Running `git annex copy --auto --from=DesktopAnnex` on the Work desktop synced the broken hastur.txt but dagon.txt didn't appear. Running the same on my laptop did nothing. Likewise on my home desktop it did nothing. (I'm not sure if running stuff from the CLI is valid when the assistant is running, but I couldn't see a "force refresh" option in the UI)
+
+In the `git log --oneline` my laptop and Work machines both have:
+<pre>
+3f541e5 Merge commit 'refs/synced/552d29fe-4a86-11e2-819a-9f61585ee7a2/master'
+cbee12b 
+dddc4f0 
+d8854e7 Merge commit 'refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/master'
+</pre>
+
+While my home desktop has:
+<pre>
+43a80d5 git-annex automatic sync
+46328db 
+d8854e7 Merge commit 'refs/synced/1167ef76-4791-11e2-9bfe-4319f44b8a5f/master'
+</pre>
+
+There are other commits prior to d8854e7 which appear to be the same on all hosts. d8854e7 was committed in December when I first played with this stuff. All the commits after that were made today as part of the experiment above, with the exception of 43a80d5 on my home desktop with was the removal of a "Test.txt" created last year. This removal also didn't sync to the other two machines.
+
+git-annex status on my home desktop (dagon) shows:
+<pre>
+semitrusted repositories: 5
+	00000000-0000-0000-0000-000000000001 -- web
+ 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- annex on hastur
+ 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- here (annex on dagon)
+ 	552d29fe-4a86-11e2-819a-9f61585ee7a2 -- ian.james.campbell (annex on zakaz)
+ 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
+</pre>
+(DesktopAnnex is the S3 remote, ian.james.campbell is my gmail username)
+
+However the webapp only shows 3 repos:
+<pre>
+	here (annex on dagon)
+	ian.james.campbell (annex on zakaz)
+	DesktopAnnex
+</pre>
+
+git-annex status on my laptop (hastur) shows only:
+<pre>
+	00000000-0000-0000-0000-000000000001 -- web
+ 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- here (ijc@hastur:~/Desktop/annex)
+ 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- ian.james.campbell (ijc@dagon:~/Desktop/annex)
+ 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
+</pre>
+
+while the webapp shows:
+<pre>
+	here (ijc@hastur:~/Desktop/annex)
+	ian.james.campbell (ijc@dagon:~/Desktop/annex)
+	DesktopAnnex
+</pre>
+
+Lastly on my work desktop (zakaz) annex status shows:
+<pre>
+	00000000-0000-0000-0000-000000000001 -- web
+ 	1167ef76-4791-11e2-9bfe-4319f44b8a5f -- annex on hastur
+ 	54f6febc-4791-11e2-952f-13bd7a1c79f1 -- ian.james.campbell (annex on dagon)
+ 	552d29fe-4a86-11e2-819a-9f61585ee7a2 -- here (annex on zakaz)
+ 	ad5c6a4c-4791-11e2-b9f0-53f8af10a9e6 -- DesktopAnnex
+</pre>
+
+The webapp shows:
+<pre>
+ 	here (annex on zakaz)
+ 	ian.james.campbell (annex on dagon)
+ 	DesktopAnnex 
+</pre>
+
+git-annex sync on any of them shows:
+<pre>
+$ git annex sync
+commit  
+# On branch master
+nothing to commit (working directory clean)
+ok
+pull ian.james.campbell 
+fatal: Unable to find remote helper for 'xmpp'
+failed
+push ian.james.campbell 
+fatal: Unable to find remote helper for 'xmpp'
+failed
+git-annex: sync: 2 failed
+</pre>
+
+## What version of git-annex are you using? On what operating system?
+
+3.20121211 on Debian Sid. All machines are amd64
+
+## Please provide any additional information below.
+
+I'm not 100% sure this sort of multiway synching is supposed to work, so maybe this is just as expected. If this isn't a bug you could consider it a feature request though ;-)
+
+This issue also made me wonder about how one would go about syncing multiple unrelated annexes via XMPP. Would you need a different gmail account for each? Maybe there is a trick similar to the email local+foo@ thing?
+
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_1_41682b2e72e657e0f23af244f8345e85._comment b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_1_41682b2e72e657e0f23af244f8345e85._comment
new file mode 100644
index 000000000..382dcee6a
--- /dev/null
+++ b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_1_41682b2e72e657e0f23af244f8345e85._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo"
+ nickname="Justin"
+ subject="comment 1"
+ date="2013-01-12T14:34:34Z"
+ content="""
+    fatal: Unable to find remote helper for 'xmpp'
+
+is probably why things are not working for you. git annex sync is not actually syncing because of that.
+"""]]
diff --git a/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_2_c7b4ea9aea6839763eb8b89e8d6a5ad5._comment b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_2_c7b4ea9aea6839763eb8b89e8d6a5ad5._comment
new file mode 100644
index 000000000..5eea53d19
--- /dev/null
+++ b/doc/bugs/three_way_sync_via_S3_and_Jabber/comment_2_c7b4ea9aea6839763eb8b89e8d6a5ad5._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhjlfoU21OiXKH_MXw75Uq5EsX7LJW5p0"
+ nickname="Ian"
+ subject="comment 2"
+ date="2013-01-12T14:47:07Z"
+ content="""
+@Justin,
+
+It seems to be synching a least something over this channel, e.g. my work desktop and laptop seem to be keeping the git side in sync at least (I think the broken symlinks appearing and the copy --from working show this?).
+
+In the pairing window (under Config->Share with a friend) it shows ian.james.campbell as being \"paired\" on all three machines.
+
+I have a feeling there isn't supposed to be a remote helper for xmpp and the assistant is expected to take care of this through other means, IOW I shouldn't be running `git annex sync` by hand at all.
+"""]]
diff --git a/doc/design/assistant/blog/day_168__back_to_theme/comment_2_5beba073373b8e75a32d1fcfdc1a0782._comment b/doc/design/assistant/blog/day_168__back_to_theme/comment_2_5beba073373b8e75a32d1fcfdc1a0782._comment
new file mode 100644
index 000000000..630892025
--- /dev/null
+++ b/doc/design/assistant/blog/day_168__back_to_theme/comment_2_5beba073373b8e75a32d1fcfdc1a0782._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://csights.myopenid.com/"
+ ip="70.226.161.163"
+ subject="&quot;local git remotes&quot;"
+ date="2013-01-13T02:36:48Z"
+ content="""
+I am not quite sure how git-annex works and I do not know what a \"local git remote\" functionality is.
+
+How about this: call a \"git remote\" a \"git-annex store\" or just \"store\".  Then instead of a remote git remote it would be a remote git-annex store or just remote store.  :)
+
+
+
+"""]]
diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
index 71809bf0a..ba3e97a6a 100644
--- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
+++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn
@@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
 adept friends or family -- what's preventing you from introducing them to
 the assistant?
 
-[[!poll open=yes expandable=yes 6 "I'm using the assistant!" 14 "I need a Windows port" 22 "I need an Android port" 1 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 9 "I want to, but have not had the time to try it" 3 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 16 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 4 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 9 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 13 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 1 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 2 "Replaces files with a symlink mess." 1 "configurable option to only annex files meeting certian size or filename criteria" 1 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file"]]
+[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 15 "I need a Windows port" 26 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 1 "Well, it's still in beta..." 10 "I want to, but have not had the time to try it" 4 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 20 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary.  Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 1 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 4 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit."]]
 
 Feel free to write in your own reasons, or add a comment to give me more info.
diff --git a/doc/forum/Detached_git_work_tree__63__.mdwn b/doc/forum/Detached_git_work_tree__63__.mdwn
new file mode 100644
index 000000000..3c1f6ae24
--- /dev/null
+++ b/doc/forum/Detached_git_work_tree__63__.mdwn
@@ -0,0 +1,11 @@
+Does git-annex (safely) handle detached work trees?
+
+That is, in git I can set `GIT_WORK_TREE=/dir/A` and `GIT_DIR=/dir/B` in the environment and have all my .git stuff in /dir/B and all my files in /dir/A.
+
+I can see this coming in useful for a few situations, but in particular for difficult file systems - like SMB or old implementations of NFS.
+
+In my particular case I have a Drobo (something like a proprietary NAS).  The Drobo is linux based, but by default mounts as a samba share or if you install `unfsd` it can be mounted via NFS.  Unfortunately, the nfs is v3 and doesn't allow locks, so git-annex barfs.  :-(
+
+What I'd like to be able to do is have a direct mode annex on the drobo, with the git directory sitting on one of my linux machines.  That machine would be the only one that would directly access the drobo data as an annex but other systems that look at the drobo would see what looks like a normal directory structure; for example my media centre - `mythtv` naturally! - would see "normal" names for my music collection, not SHA256 hashes...
+
+I guess there would be an issue if there were different `GIT_DIR`s pointing to the one `GIT_WORK_TREE`, but that is a caveat emptor IMHO. 
diff --git a/doc/forum/Syncronisation_of_syncronisation_between_3_repositories__63__.mdwn b/doc/forum/Syncronisation_of_syncronisation_between_3_repositories__63__.mdwn
new file mode 100644
index 000000000..988ec3029
--- /dev/null
+++ b/doc/forum/Syncronisation_of_syncronisation_between_3_repositories__63__.mdwn
@@ -0,0 +1,11 @@
+Hello Joey,
+
+I just want to know if file transfers between three inter-connected repositories somehow gets syncronized. I have a laptop, a local file server in my home and a virtual server on the internet.
+
+Both my laptop and my file server are configured with a full git repository and connected through pairing and xmpp. The server on the internet is configured as a rsync special remote.
+
+I want the local file server to hold a copy of everything in my annex, the rsync remote should get everything except the folder "media" (too large to upload and not that important) and the laptop whatever I manually decide (preferred content is set to "present").
+
+I have added some files to the repository on the local file server and transferred their content to my laptop by using "git annex get". But when I started the web interface, I saw that those files who are present on both the file server and on the laptop get uploaded to the remote server from both computers, often the same file at the same time. Previously I though the two assistants would somehow talk to each other via xmpp so that doubled effort like that would be avoided. I'm also worried about data consistency because two apparently separate processes rsync to the same remote repository at the same time.
+
+So my question would be: Is your xmpp protocol designed to deal with situations like this and I did not set it up correctly or is what I'm trying to accomplish simply not (yet) possible?
diff --git a/doc/forum/gadu_-_git-annex_disk_usage/comment_10_f632a62c4dbbf01b29f146893d7725f9._comment b/doc/forum/gadu_-_git-annex_disk_usage/comment_10_f632a62c4dbbf01b29f146893d7725f9._comment
new file mode 100644
index 000000000..602cc4363
--- /dev/null
+++ b/doc/forum/gadu_-_git-annex_disk_usage/comment_10_f632a62c4dbbf01b29f146893d7725f9._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="Steve"
+ ip="92.104.175.136"
+ subject="comment 10"
+ date="2013-01-14T01:54:12Z"
+ content="""
+No problem, glad to see it is useful.  I'm not exactly a web guy, but I want to get some sort of comment/discussion system up there soon so we aren't filling up Joey's web site with semi-offtopic discussion.  (also a little beautification is in order)
+
+Yes, contributions are welcome.  GPG/PGP encrypted email is the preferred mode of communication.
+
+Currently I ask for copyright assignment in case I want to change licenses in the future.  I pledge not to go to a non-free license, but the GPL3 license choice was fairly arbitrary.  I might want to add the \"or any later version\" clause, for example.  There is also potential for a library to be split off which might benefit from something like LGPL licensing or similar.  I haven't really studied the licensing situation since GPL3 came around, so I need to take some time to look into it.
+
+I don't want to have a licensing discussion here though as it would be offtopic.  Feel free to email me and we can discuss.
+
+"""]]