summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-19 12:47:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-19 12:47:23 -0400
commit36dc740c8063a47a5708a3e0611b6ef245f7e94c (patch)
tree3c347aad9d1608e7ca141916ef65d38aaeb74ce5 /doc
parent3c0c77388bb4e6d66901b95a1cf77da0071b4e02 (diff)
update
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/desymlink.mdwn5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn
index 54b7c9800..f2ba914bc 100644
--- a/doc/design/assistant/desymlink.mdwn
+++ b/doc/design/assistant/desymlink.mdwn
@@ -87,6 +87,9 @@ is converted to a real file when it becomes present.
* Deal with files changing as they're being transferred from a direct mode
repository to another git repository. The remote repo currently will
accept the bad data and update the location log to say it has the key.
+
+## done
+
* `git annex sync` updates the key to files mappings for files changed,
but needs much other work to handle direct mode:
* Generate git commit, without running `git commit`, because it will
@@ -104,4 +107,4 @@ is converted to a real file when it becomes present.
repo, replace the symlink with the direct file (either moving out
of `.git/annex/objects/` or hard-linking if the same key is present
elsewhere in the tree. **done**
- * handle merge conflicts on direct mode files
+ * handle merge conflicts on direct mode files **done**