summaryrefslogtreecommitdiff
path: root/doc/design/assistant/desymlink.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-25 16:18:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-25 16:19:03 -0400
commit7e3f9f7f49e3c75c0539a69e9f323f37eec3acbc (patch)
tree16f3ca84ec40a695ce42856383acba21fb514350 /doc/design/assistant/desymlink.mdwn
parentd50bda6b9401448626a94cac67ba8336b8aa4736 (diff)
update
Diffstat (limited to 'doc/design/assistant/desymlink.mdwn')
-rw-r--r--doc/design/assistant/desymlink.mdwn4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn
index 45229f3f3..db0e06c4b 100644
--- a/doc/design/assistant/desymlink.mdwn
+++ b/doc/design/assistant/desymlink.mdwn
@@ -87,9 +87,6 @@ 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.
-* When the assistant adds a modified direct mode file, it leaves behind
- an associated files mapping to the file for the old key as well. That
- needs to be deleted (sync deletes it in the similar situation).
* kqueue does not deliver an event when an existing file is modified;
need a different way to detect file modifications (possibly an OSX specific
interface?)
@@ -114,3 +111,4 @@ is converted to a real file when it becomes present.
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 **done**
+* support direct mode in the assistant (many little fixes)