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

Fix bug in automatic merge conflict resolution

Browse source 
When one side is an annexed symlink, and the other side is a non-annexed symlink.

In this case, git-merge does not replace the annexed symlink in the work
tree with the non-annexed symlink, which is different from it's handling of
conflicts between annexed symlinks and regular files or directories.
So, while git-annex generated the correct merge commit, the work tree
didn't get updated to reflect it.
See comments on bug for additional analysis.

Did not add this to the test suite yet; just unloaded a truckload of firewood
and am feeling lazy.

This commit was sponsored by Adam Spiers.
This commit is contained in:
Joey Hess 2014-07-08 13:54:42 -04:00
parent 1d966dbe37
commit ba42b67c70
5 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
View file

@ -47,3 +47,5 @@ git-annex 5.20140613
[[!tag confirmed]]
> [[fixed|done]] --[[Joey]]