summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-15 15:42:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-15 15:42:31 -0400
commitb2d4b7eb8fe90997b257d841c24ed91e9d93d601 (patch)
tree95358d84203cf64dc8b927fa3c1e5648f71eaa17
parent092bf96a9564fd5e7cc896e512900d1a5a3e35be (diff)
-rw-r--r--Test.hs8
1 files changed, 8 insertions, 0 deletions
diff --git a/Test.hs b/Test.hs
index 8934e8c47..6f26fa910 100644
--- a/Test.hs
+++ b/Test.hs
@@ -803,8 +803,16 @@ test_mixed_conflict_resolution env = do
let r = if inr1 then r1 else r2
indir env r $ do
git_annex env "sync" [] @? "sync failed in mixed conflict"
+ checkmerge r1
+ checkmerge r2
where
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;
- remove origin since we're going to sync