reproduced
This commit is contained in:
parent
bfe90e6a8c
commit
b66e517b28
2 changed files with 48 additions and 0 deletions
1
Test.hs
1
Test.hs
|
@ -1390,6 +1390,7 @@ test_mixed_lock_conflict_resolution =
|
|||
let v = filter (variantprefix `isPrefixOf`) l
|
||||
length v == 0
|
||||
@? (what ++ " not exactly 0 variant files in: " ++ show l)
|
||||
void $ boolSystem "sh" [Param "-l"]
|
||||
conflictor `elem` l @? ("conflictor not present after conflict resolution")
|
||||
git_annex "get" [conflictor] @? "get failed"
|
||||
git_annex_expectoutput "find" [conflictor] [conflictor]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue