diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t index 9ad13296c581bac182e4e4266702a154db49a0ee_dGVzdHMvdGVzdC1ibGFja2JveC50..0ade08dcb3c3d9a1418f38bf875d6c737750b19f_dGVzdHMvdGVzdC1ibGFja2JveC50 100644 --- a/tests/test-blackbox.t +++ b/tests/test-blackbox.t @@ -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 diff --git a/tests/test-diff-color.t b/tests/test-diff-color.t index 9ad13296c581bac182e4e4266702a154db49a0ee_dGVzdHMvdGVzdC1kaWZmLWNvbG9yLnQ=..0ade08dcb3c3d9a1418f38bf875d6c737750b19f_dGVzdHMvdGVzdC1kaWZmLWNvbG9yLnQ= 100644 --- a/tests/test-diff-color.t +++ b/tests/test-diff-color.t @@ -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) diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t index 9ad13296c581bac182e4e4266702a154db49a0ee_dGVzdHMvdGVzdC1zdWJyZXBvLnQ=..0ade08dcb3c3d9a1418f38bf875d6c737750b19f_dGVzdHMvdGVzdC1zdWJyZXBvLnQ= 100644 --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -269,5 +269,5 @@ $ 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) @@ -273,5 +273,5 @@ 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,6 +292,6 @@ 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 @@ -296,6 +296,6 @@ 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,9 +327,9 @@ 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) @@ -331,9 +331,9 @@ 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