Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix windows test failures stable
authorMads Kiilerich <madski@unity3d.com>
Fri, 28 Dec 2012 14:10:35 +0100
branchstable
changeset 18157 52581d2b98ac
parent 18141 a907826c158c
child 18158 974119c4df2b
child 18191 e4f17956f45a
tests: fix windows test failures
tests/test-diff-color.t file | annotate | diff | comparison | revisions
tests/test-rebase-pull.t file | annotate | diff | comparison | revisions 
--- a/tests/test-diff-color.t	Thu Dec 13 19:19:06 2012 +0100
+++ b/tests/test-diff-color.t	Fri Dec 28 14:10:35 2012 +0100
@@ -152,7 +152,7 @@
    c
    c
   \x1b[0;32m+aa\x1b[0m (esc)
-  \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc)
+  \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (glob) (esc)
   \x1b[0;31;1m--- a/sub/b\x1b[0m (esc)
   \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc)
   \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
--- a/tests/test-rebase-pull.t	Thu Dec 13 19:19:06 2012 +0100
+++ b/tests/test-rebase-pull.t	Fri Dec 28 14:10:35 2012 +0100
@@ -144,7 +144,7 @@
   adding L1
   created new head
   $ hg pull --rev tip --rebase
-  pulling from $TESTTMP/a
+  pulling from $TESTTMP/a (glob)
   searching for changes
   adding changesets
   adding manifests
mercurial