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

This commit is contained in:
Joey Hess 2013-08-07 12:26:24 -04:00
commit 232abe89de
6 changed files with 54 additions and 0 deletions

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 1"
date="2013-08-07T16:13:31Z"
content="""
It seems to me that you must have set `git config remote.zoidberg.annex-sync false`
(or clicked around in the webapp and caused it to set that). If you set annex-sync back to true, it will sync with all remotes by default.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://www.rfc1149.net/"
nickname="Sam"
subject="Indeed"
date="2013-08-07T16:17:41Z"
content="""
You are perfectly right. Every remote had this parameter set to false for a reason I do not know.
"""]]

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 1"
date="2013-08-07T16:07:56Z"
content="""
It seems to me that it has already finished applying the workaround. That IdentitiesOnly change could only be made
if you clicked on a Retry button once it detected a problem.
You may be experiencing a different problem that it cannot recover from. Paste your .git/config file.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 1"
date="2013-08-07T16:18:52Z"
content="""
I'd recommend that you just copy your files to the repository to publish them before running git-annex sync.
Alternatively, unless your web pages are very large, you can just check them into git directly, still use git-annex sync if you want (and still using git-annex for large files), and avoid the complication of being able to have files that are listed in the repository but whose content is not present.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 14"
date="2013-08-07T16:03:12Z"
content="""
Yes, it did turn out to be as simple as my having forgotten that I have to manually add features to the version list.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 1"
date="2013-08-07T16:09:26Z"
content="""
You can have as many git remotes as you like all pointing at the same repository via different paths. git-annex fully supports this AFAIK. Are you having some problem with it?
"""]]