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

reproduced

Browse source
This commit is contained in:
Joey Hess 2016-06-13 12:38:11 -04:00
parent bfe90e6a8c
commit b66e517b28
Failed to extract signature
2 changed files with 48 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Test.hs
View file

@ -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]