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-05-26 22:25:25 -04:00
parent 76720a6d0d
commit 697298718c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,11 @@ all the other git clones, at both the git level and the key/value level.
1. At regular intervals, just run `git annex sync`, which already handles 1. At regular intervals, just run `git annex sync`, which already handles
bidirectional syncing. bidirectional syncing.
2. Investigate the XMPP approach like dvcs-autosync does, or other ways of 2. Use a git merge driver that adds both conflicting files,
so conflicts never break a sync.
3. Investigate the XMPP approach like dvcs-autosync does, or other ways of
signaling a change out of band. signaling a change out of band.
3. Add a hook, so when there's a change to sync, a program can be run. 4. Add a hook, so when there's a change to sync, a program can be run.
## data syncing ## data syncing
@ -29,3 +31,6 @@ This probably will need lots of refinements to get working well.
This assumes the network is connected. It's often not, so the This assumes the network is connected. It's often not, so the
cloud needs to be used to bridge between LANs. cloud needs to be used to bridge between LANs.
It would be nice if, when a USB drive is connected,
syncing starts automatically.