fix test suite breakage

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"