diff options
| -rw-r--r-- | Test.hs | 9 | ||||
| -rw-r--r-- | doc/todo/smudge.mdwn | 8 |
2 files changed, 10 insertions, 7 deletions
@@ -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 diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 0d2f30e07..34a73740d 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -3,11 +3,9 @@ git-annex should use smudge/clean filters. ### implementation todo list * Test suite: - Next "needs to be done" is to work on the test suite some more for v6 - repositories. Need to add a test for how it resolves a conflict between - an unlocked and a locked file that point to the same key. Need to add - another pass through all the tests with files being unlocked. And need to - fix the two remaining test failures. + - add a test for how it resolves a conflict between + an unlocked and a locked file that point to the same key. + - add another pass through all the tests with files being unlocked in v6 mode * Reconcile staged changes into the associated files database, whenever the database is queried. This is needed to handle eg: git add largefile |