Mercurial > evolve
diff tests/test-obsolete.t @ 374:2c969d1b18e0 stable
obsolete: change warning output to match mercurial core on
The new messages were introduced by hg@12fdaa30063a.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Wed, 25 Jul 2012 17:28:32 +0200 |
parents | 56d4c6207ef9 |
children | 1d6cc8c22cd9 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Jul 19 16:16:08 2012 +0200 +++ b/tests/test-obsolete.t Wed Jul 25 17:28:32 2012 +0200 @@ -147,7 +147,7 @@ $ hg push ../other-new pushing to ../other-new searching for changes - abort: Trying to push unstable changeset: a7a6f2b5d8a5! + abort: push includes an unstable changeset: a7a6f2b5d8a5! (use 'hg stabilize' to get a stable history (or --force to proceed)) [255] $ hg push -f ../other-new @@ -200,7 +200,7 @@ $ hg push ../other-new pushing to ../other-new searching for changes - abort: Trying to push unstable changeset: 95de7fc6918d! + abort: push includes an unstable changeset: 95de7fc6918d! (use 'hg stabilize' to get a stable history (or --force to proceed)) [255] $ hg push ../other-new -f # use f because there is unstability @@ -269,7 +269,7 @@ $ hg push ../other-old pushing to ../other-old searching for changes - abort: Trying to push unstable changeset: 909a0fb57e5d! + abort: push includes an unstable changeset: 909a0fb57e5d! (use 'hg stabilize' to get a stable history (or --force to proceed)) [255] $ hg push -f ../other-old @@ -517,7 +517,7 @@ $ hg push ../other-new/ pushing to ../other-new/ searching for changes - abort: Trying to push latecomer changeset: 6db5e282cb91! + abort: push includes an latecomer changeset: 6db5e282cb91! (use 'hg stabilize' to get a stable history (or --force to proceed)) [255]