diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-29 15:41:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-29 15:41:09 -0400 |
| commit | bc22a44b2d8ea4edd4e830604acde9de8deb204b (patch) | |
| tree | 9da82a7f657ba8873de4f8b0f8b4592b34011769 /doc/todo | |
| parent | c40dad95d5ff114f15db9779fdbff455b913a9d5 (diff) | |
automatic conflict resolution for v6 unlocked files
Several tricky parts:
* When the conflict is just between the same key being locked and unlocked,
the unlocked version wins, and the file is not renamed in this case.
* Need to update associated file map when conflict resolution renames
an unlocked file.
* git merge runs the smudge filter on the conflicting file, and actually
overwrites the file with the same content it had before, and so
invalidates its inode cache. This makes it difficult to know when it's
safe to remove such files as conflict cruft, without going so far as to
compare their entire contents.
Dealt with this by preventing the smudge filter from populating the file
when a merge is run. However, that also prevents the smudge filter being
run for non-conflicting files, so eg moving a file won't put its new
content into place.
* Ideally, if a merge or a merge conflict resolution renames an unlocked
file, the file in the work tree can just be moved, rather than copying
the content to a new worktree file.
This is attempted to be done in merge conflict resolution, but
due to git merge's behavior of running smudge filters, what actually
seems to happen is the old worktree file with the content is deleted and
rewritten as a pointer file, so doesn't get reused.
So, this is probably not as efficient as it optimally could be.
If that becomes a problem, could look into running the merge in a separate
worktree and updating the real worktree more efficiently, similarly to the
direct mode merge. However, the direct mode merge had a lot of bugs, and
I'd rather not use that more error-prone method unless really needed.
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/smudge.mdwn | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 03e253952..4c9f4acf6 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -18,10 +18,6 @@ git-annex should use smudge/clean filters. (And should avoid unlocking an object with a hard link if it's hard linked to a shared clone, but that's already accomplished because it avoids unlocking an object if it's hard linked at all) -* Make automatic merge conflict resolution work for pointer files. - - Should probably automatically handle merge conflicts between annex - symlinks and pointer files too. Maybe by always resulting in a pointer - file, since the symlinks don't work everwhere. * Crippled filesystem should cause all files to be transparently unlocked. Note that this presents problems when dealing with merge conflicts and when pushing changes committed in such a repo. Ideally, should avoid |