diff options
author | 2014-03-04 15:06:40 -0400 | |
---|---|---|
committer | 2014-03-04 15:06:40 -0400 | |
commit | fdec0adbbe4ea657bba7eeee84ba176ae7be73d6 (patch) | |
tree | f0d4c140099fb769a03b58f9f79e7bd71b7238ec /Test.hs | |
parent | 05a1f05d157d1b18a8dadd7a6b08991da8e7cdc4 (diff) |
fix test case to convert slashes for DOS
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -35,6 +35,7 @@ import qualified Git.Filename import qualified Git.Types import qualified Git.Ref import qualified Git.LsTree +import qualified Git.FilePath import qualified Locations import qualified Types.KeySource import qualified Types.Backend @@ -849,7 +850,7 @@ test_mixed_conflict_resolution env = do -- it's possible to lose track. indir env d $ do git_annex env "get" (conflictor:v) @? ("get failed in " ++ what) - git_annex_expectoutput env "find" [conflictor] [subfile] + git_annex_expectoutput env "find" [conflictor] [Git.FilePath.toInternalGitPath subfile] git_annex_expectoutput env "find" v v {- Check merge conflict resolution when there is a local file, @@ -926,7 +927,7 @@ test_conflict_resolution_symlinks env = do where conflictor = "conflictor" check_is_link f what = do - git_annex_expectoutput env "find" ["--include=*", f] [f] + git_annex_expectoutput env "find" ["--include=*", f] [Git.FilePath.toInternalGitPath f] l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles Git.Ref.headRef [f] all (\i -> Git.Types.toBlobType (Git.LsTree.mode i) == Just Git.Types.SymlinkBlob) l @? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l) |