diff -r 11212babc690 -r 39d1f83eb05d tests/test-phases-exchange.t --- a/tests/test-phases-exchange.t Fri Apr 27 13:18:09 2012 -0500 +++ b/tests/test-phases-exchange.t Tue Apr 24 16:32:44 2012 +0200 @@ -833,12 +833,20 @@ o 0 public a-A - 054250a37db4 -pushing a locally public and draft changesets remotly secret should make them appear on the remote side +pushing a locally public and draft changesets remotly secret should make them +appear on the remote side. + $ hg -R ../mu phase --secret --force 967b449fbc94 $ hg push -r 435b5d83910c ../mu pushing to ../mu searching for changes + abort: push creates new remote head 435b5d83910c! + (did you forget to merge? use push -f to force) + [255] + $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head + pushing to ../mu + searching for changes adding changesets adding manifests adding file changes