test suite 100% pass in v6, finally!

Set annex.largefiles when adding the conflicting non-annexed file,
otherwise it would be added as an annexed file.

1 files changed, 7 insertions, 2 deletions

diff --git a/Test.hs b/Test.hs
index 643969440..86f80fee6 100644
--- a/Test.hs
+++ b/Test.hs
@@ -123,8 +123,8 @@ tests = testGroup "Tests" $ properties :
 	map (\(d, te) -> withTestMode te (unitTests d)) testmodes
   where
 	testmodes =
-		-- [ ("v6", TestMode { forceDirect = False, annexVersion = "6" })
-		[ ("v5", TestMode { forceDirect = False, annexVersion = "5" })
+		[ ("v6", TestMode { forceDirect = False, annexVersion = "6" })
+		, ("v5", TestMode { forceDirect = False, annexVersion = "5" })
 		-- Windows will only use direct mode, so don't test twice.
 #ifndef mingw32_HOST_OS
 		, ("v5 direct", TestMode { forceDirect = True,  annexVersion = "5" })
@@ -1097,6 +1097,11 @@ test_nonannexed_file_conflict_resolution = do
 				indir r2 $ do
 					disconnectOrigin
 					writeFile conflictor nonannexed_content
+					boolSystem "git"
+						[ Param "config"
+						, Param "annex.largefiles"
+						, Param ("exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor)
+						] @? "git config annex.largefiles failed"
 					boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
 					git_annex "sync" [] @? "sync failed in r2"
 				pair r1 r2