Mercurial > hg
changeset 17564:6d0efc802856
test-obsolete-checkheads: fix on windows
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Fri, 14 Sep 2012 20:40:52 +0200 |
parents | 46db0ec640f3 |
children | f62ed3d90377 |
files | tests/test-obsolete-checkheads.t |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete-checkheads.t Fri Sep 14 12:09:44 2012 -0700 +++ b/tests/test-obsolete-checkheads.t Fri Sep 14 20:40:52 2012 +0200 @@ -41,7 +41,7 @@ $ mkcommit old $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -64,7 +64,7 @@ Push should not warn about creating new head $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -80,7 +80,7 @@ $ cp -r ../backup1 ../remote $ hg -R ../remote phase --public c70b08862e08 $ hg pull -v - pulling from $TESTTMP/remote + pulling from $TESTTMP/remote (glob) searching for changes no changes found $ hg glog --hidden @@ -94,7 +94,7 @@ Abort: old will still be an head because it's public. $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes abort: push creates new remote head 71e3228bffe1! (did you forget to merge? use push -f to force) @@ -154,7 +154,7 @@ Push should abort on new head $ hg push -r 'desc("other")' - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes abort: push creates new remote head d7d41ccbd4de! (did you forget to merge? use push -f to force) @@ -181,7 +181,7 @@ $ mkcommit new created new head $ hg push -f - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -216,7 +216,7 @@ one anyway. $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -264,7 +264,7 @@ handled yet. $ hg push --traceback - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests