summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 11:06:36 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 11:06:36 -0400
commit1785f1c62fb50c19a828f3693fe17aa5a22b2ed7 (patch)
tree12adb728fba14889b6ca2933694152ac882a9c6f
parent528f8ab9d85d39cabea6d846aba758a9927db910 (diff)
fix test suite breakage
-rw-r--r--Test.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Test.hs b/Test.hs
index 3bd627957..6cddc7738 100644
--- a/Test.hs
+++ b/Test.hs
@@ -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"