Mercurial > hg
changeset 18720:0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
This lines were reported as unnecessary when running the tests on windows
because the path was already printed with a slash and not a backslash.
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Sat, 23 Feb 2013 22:54:57 +0100 |
| parents | 9ad13296c581 |
| children | c2d079387b2c |
| files | tests/test-blackbox.t tests/test-diff-color.t tests/test-subrepo.t |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-blackbox.t Sat Feb 23 22:07:38 2013 +0100 +++ b/tests/test-blackbox.t Sat Feb 23 22:54:57 2013 +0100 @@ -57,7 +57,7 @@ (run 'hg update' to get a working copy) $ hg blackbox -l 3 1970/01/01 00:00:00 bob> pull - 1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62 (glob) + 1970/01/01 00:00:00 bob> 1 incoming changes - new heads: d02f48003e62 1970/01/01 00:00:00 bob> pull exited None after * seconds (glob) extension and python hooks - use the eol extension for a pythonhook
--- a/tests/test-diff-color.t Sat Feb 23 22:07:38 2013 +0100 +++ b/tests/test-diff-color.t Sat Feb 23 22:54:57 2013 +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 (glob) (esc) + \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (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-subrepo.t Sat Feb 23 22:07:38 2013 +0100 +++ b/tests/test-subrepo.t Sat Feb 23 22:54:57 2013 +0100 @@ -269,9 +269,9 @@ $ cd .. $ hg clone t tc updating to branch default - cloning subrepo s from $TESTTMP/t/s (glob) + cloning subrepo s from $TESTTMP/t/s cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) - cloning subrepo t from $TESTTMP/t/t (glob) + cloning subrepo t from $TESTTMP/t/t 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd tc $ hg debugsub @@ -292,10 +292,10 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes no changes found - pushing subrepo t to $TESTTMP/t/t (glob) + pushing subrepo t to $TESTTMP/t/t searching for changes adding changesets adding manifests @@ -317,7 +317,7 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes abort: push creates new remote head 12a213df6fa9! (in subrepo s) (did you forget to merge? use push -f to force) @@ -327,13 +327,13 @@ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) searching for changes no changes found - pushing subrepo s to $TESTTMP/t/s (glob) + pushing subrepo s to $TESTTMP/t/s searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - pushing subrepo t to $TESTTMP/t/t (glob) + pushing subrepo t to $TESTTMP/t/t searching for changes no changes found searching for changes @@ -366,7 +366,7 @@ should pull t $ hg up - pulling subrepo t from $TESTTMP/t/t (glob) + pulling subrepo t from $TESTTMP/t/t searching for changes adding changesets adding manifests @@ -572,7 +572,7 @@ adding .hgsub $ hg clone repo repo2 updating to branch default - cloning subrepo s from $TESTTMP/repo/s (glob) + cloning subrepo s from $TESTTMP/repo/s 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -q -R repo2 pull -u $ echo 1 > repo2/s/a