diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-25 14:10:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-25 14:10:07 -0400 |
| commit | bf3472bb1409d9879272471420d6724ee4ed096b (patch) | |
| tree | 2a8e96b9c2130298897b6adcf2ac3dabd421ce71 /doc/design/assistant/desymlink.mdwn | |
| parent | 399b31f5f3adfe2b9cd662c8b0e8127067568364 (diff) | |
use sync command merge engine in assistant
To handle direct mode merging.
Diffstat (limited to 'doc/design/assistant/desymlink.mdwn')
| -rw-r--r-- | doc/design/assistant/desymlink.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn index f2ba914bc..45229f3f3 100644 --- a/doc/design/assistant/desymlink.mdwn +++ b/doc/design/assistant/desymlink.mdwn @@ -87,6 +87,12 @@ 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?) ## done |