mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use sync command merge engine in assistant

Browse source 
To handle direct mode merging.
This commit is contained in:
Joey Hess 2012-12-25 14:10:07 -04:00
parent 9fcfcab485
commit 8a8380f1b7
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/design/assistant/desymlink.mdwn
View file

@ -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