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

3 files changed, 62 insertions, 0 deletions

diff --git a/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_1_cb43a2bc976e3eb1cfc3ee9d4d34e78e._comment b/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_1_cb43a2bc976e3eb1cfc3ee9d4d34e78e._comment
new file mode 100644
index 000000000..ae117f36f
--- /dev/null
+++ b/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_1_cb43a2bc976e3eb1cfc3ee9d4d34e78e._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-04-23T17:54:14Z"
+ content="""
+Are files that you add in machine A showing up in machine B as broken symlinks? If so, jabber sync is working and the problem is with the Box.com remore. If not, the problem must be with the jabber sync.
+
+The log includes something like this when git is pulling over jabber:
+
+<pre>
+[2013-04-22 14:08:05 JEST] XMPPClient: Syncing with youraccount
+To xmpp::youraccount@gmail.com
+   385f85c..3aae8b7  git-annex -> refs/synced/8ff0aa10-0a9d-4184-b16f-27b32ef87372/ZmFtaWx5QGtpdGVuZXQubmV0/git-annex
+</pre>
+
+You can turn on debugging (--debug at startup or Enable debug logging in Configuration -> Preferences) to get full XMPP protocol dumps in the log. If you do not see something like the above, please do so, and paste them, so I can debug why it's not working.
+
+> When editing the Box.com repository, the option to select a directory no longer appears
+
+This is normal; it doesn't make sense to change the directory the remote uses once the remote is in use.
+"""]]
diff --git a/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_2_3375e9bfab3fed271413bd9bb5fa0121._comment b/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_2_3375e9bfab3fed271413bd9bb5fa0121._comment
new file mode 100644
index 000000000..f3a39ef2f
--- /dev/null
+++ b/doc/bugs/Unable_to_sync_a_second_machine_through_Box/comment_2_3375e9bfab3fed271413bd9bb5fa0121._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="http://keverets.livejournal.com/"
+ ip="108.170.138.61"
+ subject="comment 2"
+ date="2013-04-23T19:04:15Z"
+ content="""
+I do see XMPP connecting after I enable logging (could the XMPP status be shown in the webapp directly?)
+
+It shows long, long lists of PresenceMessages:
+
+    [2013-04-23 14:55:56 EDT] XMPPClient: connected JID \"...\"
+    [2013-04-23 14:55:56 EDT] XMPPClient: received: [PresenceMessage (Presence {presenceType = PresenceAvailable, presenceTo = Just (JID ...
+
+Still no files gets transferred from Box.com to the second machine.  I see:
+
+    [2013-04-23 14:53:41 EDT] main: Syncing with box.com
+
+but no:
+
+    XMPPClient: Syncing
+
+anywhere in the log.
+
+>> When editing the Box.com repository, the option to select a directory no longer appears
+> This is normal; it doesn't make sense to change the directory the remote uses once the remote is in use.
+
+It might not make sense to change it, but it would be useful to still see it (if disabled), especially when there are a few different Box.com directories that are shared with different repositories.
+
+Thanks again for any hints.
+"""]]
diff --git a/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__/comment_1_13510e954e36484e196e7395a3a9bf1f._comment b/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__/comment_1_13510e954e36484e196e7395a3a9bf1f._comment
new file mode 100644
index 000000000..639e364d8
--- /dev/null
+++ b/doc/bugs/git-annex-shell:_user_error___40__unrecognized_option___96__--uuid__39__/comment_1_13510e954e36484e196e7395a3a9bf1f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-04-23T17:57:10Z"
+ content="""
+`git annex version` is how you tell git-annex to print its version.
+
+The problem is not with the locally installed version of git-annex. You have a *very* old version of git-annex-shell installed on the server you're using as a remote. The last version of git-annex that did not support `git-annex-shell --uuid` was 3.20110928. You need to upgrade it to make it work with modern git-annex.
+"""]]