summaryrefslogtreecommitdiff
path: root/doc/design/assistant/syncing.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-17 12:27:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-17 12:27:12 -0400
commit30f7b1599cd02b8b9bbbb76463c5d4f84cba3552 (patch)
tree43998df0936fa64c2d3deeb0c5216bc6eb0d41df /doc/design/assistant/syncing.mdwn
parentc34d8ae088e284b7585b7e32330945d1e9c922f2 (diff)
parentf5f88794713ebbbbc177d064f074a80ca23e9b79 (diff)
Merge branch 'master' into assistant
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
-rw-r--r--doc/design/assistant/syncing.mdwn6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index 3ccff8008..66502ec85 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -7,7 +7,9 @@ all the other git clones, at both the git level and the key/value level.
location tracking indicates remotes do not, and enqueue Uploads for
them. Also, enqueue Downloads for any files we're missing.
* After git sync, identify content that we don't have that is now available
- on remotes, and transfer.
+ on remotes, and transfer. But first, need to ensure that when a remote
+ receives content, and updates its location log, it syncs that update
+ out.
## longer-term TODO
@@ -96,6 +98,8 @@ anyway.
Watcher. **done**
* enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by
Watcher. **done**
+ (Note: Needs git-annex branch to be merged before the tree is merged,
+ so it knows where to download from. Checked and this is the case.)
* Write basic Transfer handling thread. Multiple such threads need to be
able to be run at once. Each will need its own independant copy of the
Annex state monad. **done**