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

This commit is contained in:
Joey Hess 2013-04-23 15:37:55 -04:00
commit 1425b30747
3 changed files with 62 additions and 0 deletions

View file

@ -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.
"""]]

View file

@ -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.
"""]]

View file

@ -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.
"""]]