# HG changeset patch # User Patrick Mezard # Date 2012-09-14 18:40:52 # Node ID 6d0efc802856fe00be6b9e698294a076a0937084 # Parent 46db0ec640f339895e81a1be617f236b687f3b73 test-obsolete-checkheads: fix on windows diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t --- a/tests/test-obsolete-checkheads.t +++ b/tests/test-obsolete-checkheads.t @@ -41,7 +41,7 @@ setup $ mkcommit old $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -64,7 +64,7 @@ old exists remotely as draft. It is obso 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 @@ setup $ 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 @@ setup 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 @@ old exists remotely as draft. It is obso 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 @@ setup. (The obsolete marker is known loc $ 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 @@ Push should not warn about adding new he one anyway. $ hg push - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests @@ -264,7 +264,7 @@ It should not complain about "unsynced r handled yet. $ hg push --traceback - pushing to $TESTTMP/remote + pushing to $TESTTMP/remote (glob) searching for changes adding changesets adding manifests