Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.
I think this is a git behavior change, but have not checked to be sure. Conflict cruft used to look like $foo~HEAD, but now just $foo is left behind as conflict cruft. With test case.
This commit is contained in:
parent
cb66ca3a76
commit
61a35de433
3 changed files with 5 additions and 2 deletions
1
Test.hs
1
Test.hs
|
@ -857,6 +857,7 @@ test_conflict_resolution testenv =
|
|||
let v = filter (variantprefix `isPrefixOf`) l
|
||||
length v == 2
|
||||
@? (what ++ " not exactly 2 variant files in: " ++ show l)
|
||||
conflictor `notElem` l @? ("conflictor still present after conflict resolution")
|
||||
indir testenv d $ do
|
||||
git_annex testenv "get" v @? "get failed"
|
||||
git_annex_expectoutput testenv "find" v v
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue