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

fix test suite breakage

Browse source
This commit is contained in:
Joey Hess 2016-05-23 11:06:36 -04:00
parent fe944a96d3
commit 8f1525e35b
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Test.hs
View file

@ -1062,9 +1062,10 @@ test_conflict_resolution_adjusted_branch = whenM Annex.AdjustedBranch.isGitVersi
writeFile conflictor "conflictor2"
add_annex conflictor @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r2"
-- need v6 to use adjust
git_annex "upgrade" [] @? "upgrade failed"
git_annex "adjust" ["--unlock"] @? "adjust failed"
unlessM (annexeval Config.isDirect) $ do
-- need v6 to use adjust
git_annex "upgrade" [] @? "upgrade failed"
git_annex "adjust" ["--unlock"] @? "adjust failed"
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
git_annex "sync" [] @? "sync failed"