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

add test case for b0f85b3e22

Browse source
This commit is contained in:
Joey Hess 2013-11-15 15:42:31 -04:00
parent 238fa05545
commit 27fb2b6126
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Test.hs
View file

@ -803,8 +803,16 @@ test_mixed_conflict_resolution env = do
let r = if inr1 then r1 else r2 let r = if inr1 then r1 else r2
indir env r $ do indir env r $ do
git_annex env "sync" [] @? "sync failed in mixed conflict" git_annex env "sync" [] @? "sync failed in mixed conflict"
checkmerge r1
checkmerge r2
where where
conflictor = "conflictor" conflictor = "conflictor"
variantprefix = conflictor ++ ".variant"
checkmerge d = do
doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing")
(any (variantprefix `isPrefixOf`)
<$> getDirectoryContents d)
@? (d ++ "conflictor file missing")
{- Set up repos as remotes of each other; {- Set up repos as remotes of each other;
- remove origin since we're going to sync - remove origin since we're going to sync