mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update

Browse source
This commit is contained in:
Joey Hess 2012-06-23 01:19:33 -04:00
parent 264dd38c65
commit 3118eeb63f
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/syncing.mdwn
View file

@ -13,6 +13,8 @@ all the other git clones, at both the git level and the key/value level.
[The watching can be done with the existing inotify code! This avoids needing [The watching can be done with the existing inotify code! This avoids needing
any special mechanism to notify a remote that it's been synced to.] any special mechanism to notify a remote that it's been synced to.]
**done** **done**
1. Periodically retry pushes that failed. Also, detect if a push failed
due to not being up-to-date, pull, and repush.
2. Use a git merge driver that adds both conflicting files, 2. Use a git merge driver that adds both conflicting files,
so conflicts never break a sync. so conflicts never break a sync.
3. Investigate the XMPP approach like dvcs-autosync does, or other ways of 3. Investigate the XMPP approach like dvcs-autosync does, or other ways of