diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-25 20:40:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-25 20:40:58 -0400 |
| commit | 336cee671e07164c37f01f26573bb9d584368a98 (patch) | |
| tree | 2564959a5f0b6932dd2fb33001fbedf1890bce3e /doc/design/assistant/syncing.mdwn | |
| parent | 17a8f60710a8794b16bbdd7b4155e9e7427bf5cc (diff) | |
blog for the day
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
| -rw-r--r-- | doc/design/assistant/syncing.mdwn | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index 8173457c5..3e90e6b10 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -13,8 +13,9 @@ 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 any special mechanism to notify a remote that it's been synced to.] **done** -1. Periodically retry pushes that failed. Also, detect if a push failed - due to not being up-to-date, pull, and repush. +1. Periodically retry pushes that failed. **done** (every half an hour) +1. Also, detect if a push failed due to not being up-to-date, pull, + and repush. **done** 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 @@ -41,7 +42,7 @@ This probably will need lots of refinements to get working well. ## other considerations It would be nice if, when a USB drive is connected, -syncing starts automatically. +syncing starts automatically. Use dbus on Linux? This assumes the network is connected. It's often not, so the [[cloud]] needs to be used to bridge between LANs. |