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-28 14:48:46 -04:00
parent 638a321ca5
commit c7328556a3
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,12 +17,18 @@ all the other git clones, at both the git level and the key/value level.
1. Also, detect if a push failed due to not being up-to-date, pull, 1. Also, detect if a push failed due to not being up-to-date, pull,
and repush. **done** and repush. **done**
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. **done**
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
signaling a change out of band. signaling a change out of band.
4. 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
and do its own signaling. and do its own signaling.
## misc todo
* --debug will show often unnecessary work being done. Optimise.
* It would be nice if, when a USB drive is connected,
syncing starts automatically. Use dbus on Linux?
## data syncing ## data syncing
There are two parts to data syncing. First, map the network and second, There are two parts to data syncing. First, map the network and second,
@ -41,8 +47,5 @@ This probably will need lots of refinements to get working well.
## other considerations ## other considerations
It would be nice if, when a USB drive is connected,
syncing starts automatically. Use dbus on Linux?
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.