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

2 files changed, 8 insertions, 33 deletions

diff --git a/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive/comment_3_f359d9b9356de7ee10b9e725a011cc43._comment b/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive/comment_3_f359d9b9356de7ee10b9e725a011cc43._comment
new file mode 100644
index 000000000..caec25ffd
--- /dev/null
+++ b/doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive/comment_3_f359d9b9356de7ee10b9e725a011cc43._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnov5q9_Cl4Ps5NoYE08yE01NLSvBANnY8"
+ nickname="Eric"
+ subject="comment 3"
+ date="2014-07-10T05:50:32Z"
+ content="""
+Actually, I understand the logic behind encouraging bare repositories.
+"""]]
diff --git a/doc/forum/help_needed_with_setup:_2_local_computers_and_box.com.mdwn b/doc/forum/help_needed_with_setup:_2_local_computers_and_box.com.mdwn
deleted file mode 100644
index e484c4f0e..000000000
--- a/doc/forum/help_needed_with_setup:_2_local_computers_and_box.com.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-**EDIT: partially solved**
-*by looking around I might have come upon the solution to my own question: the webapp uses a shared cipher for encryption, and since the cipher is stored in the git repository, only the contents will be synced in the encrypted repository (in the cloud in this case). So both computers need to be online to sync, because the cloud only has the content of the files and not the whole annex repository.*
-
----
-
-Hello everyone,
-
-I need some help with this use-case: two local computers, paired with git annex, also sync in the cloud (box.com) to pull and push changes even when the other local computer is offline.
-
-I've tried the following steps with the webapp, but the result isn't working so far:
-
-1. Create repo in *Computer A* through the webapp.
-2. Create repo in *Computer B* through the webapp.
-3. In *Computer A*, add box.com encrypted repository and put it in the 'backup' group (Just to make sure that it gets everything but I've also tried re-doing the whole procedure with box.com set to 'transfer' (as suggested by the webapp), and still will not work).
-4. Pair computer *A* and *B* over the local network. 
-5. Now also enable box.com in *B* (the cloud repo has appeared thanks to pairing)
-
-So far, when everyone is online, everything syncs correctly. Creating "file1" in *A*, will sync it to all repositories as shown by "git annex whereis file1".
-
-The problem is that this won't work for the following use-case, which I'm currently trying to solve:
-
-(continued from the previous steps)
-
-6. *B* goes offline.
-7. *A* creates a file (or makes a change), which is correctly synced to box.com (*whereis* shows that it's there too). As expected, syncing with B fails because B is offline.
-8. *A* goes offline.
-9. *B* come back online.
-
-The expected behavior here is that B gets the new file (or change) from box.com, since it's been pushed there by *A*, but this doesn't happen. Strangely, the new file doesn't get in *B* until *A* comes back online.
-
-**What am I missing? Should I do something differently to get this behavior?**
-
-Thanks everyone for your help.