From 81d9661e081a7ca11f4bf5547ffe180071fd81ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 May 2016 11:23:30 -0400 Subject: fix recent test suite reversion git annex adjust --force will overwrite any current adjusted branch. I didn't document this because for the user, deleting the branch is just as good. --- Test.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Test.hs') diff --git a/Test.hs b/Test.hs index 6cddc7738..f98b8c510 100644 --- a/Test.hs +++ b/Test.hs @@ -1062,10 +1062,12 @@ 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" - unlessM (annexeval Config.isDirect) $ do - -- need v6 to use adjust - git_annex "upgrade" [] @? "upgrade failed" - git_annex "adjust" ["--unlock"] @? "adjust failed" + -- need v6 to use adjust + git_annex "upgrade" [] @? "upgrade failed" + -- We might be in an adjusted branch + -- already, when eg on a crippled + -- filesystem. So, --force it. + git_annex "adjust" ["--unlock", "--force"] @? "adjust failed" pair r1 r2 forM_ [r1,r2,r1] $ \r -> indir r $ git_annex "sync" [] @? "sync failed" -- cgit v1.2.3