Mercurial > evolve
diff tests/test-obsolete.t @ 390:54582eebeb08
obsolete: fix typos, improve messages
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Thu, 26 Jul 2012 13:40:32 +0200 |
| parents | cb575242d2ba |
| children | 42828b0ace98 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Jul 26 13:45:09 2012 +0200 +++ b/tests/test-obsolete.t Thu Jul 26 13:40:32 2012 +0200 @@ -160,7 +160,7 @@ pushing to ../other-new searching for changes abort: push includes an unstable changeset: a7a6f2b5d8a5! - (use 'hg stabilize' to get a stable history (or --force to proceed)) + (use 'hg stabilize' to get a stable history or --force to ignore warnings) [255] $ hg push -f ../other-new pushing to ../other-new @@ -213,7 +213,7 @@ pushing to ../other-new searching for changes abort: push includes an unstable changeset: 95de7fc6918d! - (use 'hg stabilize' to get a stable history (or --force to proceed)) + (use 'hg stabilize' to get a stable history or --force to ignore warnings) [255] $ hg push ../other-new -f # use f because there is unstability pushing to ../other-new @@ -282,7 +282,7 @@ pushing to ../other-old searching for changes abort: push includes an unstable changeset: 909a0fb57e5d! - (use 'hg stabilize' to get a stable history (or --force to proceed)) + (use 'hg stabilize' to get a stable history or --force to ignore warnings) [255] $ hg push -f ../other-old pushing to ../other-old @@ -532,8 +532,8 @@ $ hg push ../other-new/ pushing to ../other-new/ searching for changes - abort: push includes an latecomer changeset: 6db5e282cb91! - (use 'hg stabilize' to get a stable history (or --force to proceed)) + abort: push includes a latecomer changeset: 6db5e282cb91! + (use 'hg stabilize' to get a stable history or --force to ignore warnings) [255] Check hg commit --amend compat