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

sync: Fix double merge conflict resolution handling.

Browse source 
Ie, when there'a a conflicted merge we may get foo.variant-xxxx
created in a merge. If a second merge conflict occurs on that new file,
it was not falling back to putting in the whole key (which should stop
the merge conflicts happening for good, but is ugly).
This commit is contained in:
Joey Hess 2013-05-26 17:42:15 -04:00
parent bd8f358e6d
commit 919a7d7316
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Sync.hs
View file

@ -302,7 +302,7 @@ mergeFile file key
| otherwise = go $ shortHash $ key2file key | otherwise = go $ shortHash $ key2file key
where where
varmarker = ".variant-" varmarker = ".variant-"
doubleconflict = varmarker `isSuffixOf` (dropExtension file) doubleconflict = varmarker `isInfixOf` file
go v = takeDirectory file go v = takeDirectory file
</> dropExtension (takeFileName file) </> dropExtension (takeFileName file)
++ varmarker ++ v ++ varmarker ++ v

1
debian/changelog vendored
View file

@ -17,6 +17,7 @@ git-annex (4.20130522) UNRELEASED; urgency=low
like with ssh remotes. like with ssh remotes.
* content: New command line way to view and configure a repository's * content: New command line way to view and configure a repository's
preferred content settings. preferred content settings.
* sync: Fix double merge conflict resolution handling.
-- Joey Hess <joeyh@debian.org> Tue, 21 May 2013 18:22:46 -0400 -- Joey Hess <joeyh@debian.org> Tue, 21 May 2013 18:22:46 -0400