diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-08 13:54:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-08 13:55:11 -0400 |
| commit | 84ffc8f7d265c8a685c1ea081c8a8871c7ee1b44 (patch) | |
| tree | 10c36135ebc8b298d18ee7f633fed61a5d31a2e4 /debian | |
| parent | 069e875da6d98f0d10c390541ccac733bea41e2b (diff) | |
Fix bug in automatic merge conflict resolution
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 39ce9ca11..6d151ee08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ git-annex (5.20140708) UNRELEASED; urgency=medium * Fix git version that supported --no-gpg-sign. + * Fix bug in automatic merge conflict resolution, when one side is an + annexed symlink, and the other side is a non-annexed symlink. -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 |