summaryrefslogtreecommitdiff
path: root/doc/design/assistant/syncing.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-02 15:45:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-02 15:45:20 -0400
commit3ea708e03b253456961aeeffb4cf37bd15432d09 (patch)
tree131daffaea10c8a7e3e4890df74fe21e9a87b6f9 /doc/design/assistant/syncing.mdwn
parent7625319c2c18c1d75a4ba5e4c2819fb0a31641ed (diff)
parent0c0fd0c54c126268a4867e4dd0d1d42a46621665 (diff)
Merge branch 'master' into assistant
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
-rw-r--r--doc/design/assistant/syncing.mdwn3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index 5476b56f1..e3fdca316 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -7,8 +7,7 @@ all the other git clones, at both the git level and the key/value level.
**done**
* locking for the files, so redundant transfer races can be detected,
and failed transfers noticed **done**
-* transfer info for git-annex-shell (problem: how to add a switch
- with the necessary info w/o breaking backwards compatability?)
+* transfer info for git-annex-shell **done**
* update files as transfers proceed. See [[progressbars]]
(updating for downloads is easy; for uploads is hard)
* add Transfer queue TChan