Mercurial > evolve
diff tests/test-tutorial.t @ 492:7ecd41520dae
rename `stabilize` to `evolve`
stabilize keep being valide but as Matt still like "Changeset Evolution" as a
name evolve make more sense.
Stabilize is a bit too tight to unstable too.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 24 Aug 2012 11:17:18 +0200 |
parents | 2111c655b4f5 |
children | d1c658a6d0bc |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri Aug 24 10:44:23 2012 +0200 +++ b/tests/test-tutorial.t Fri Aug 24 11:17:18 2012 +0200 @@ -610,18 +610,18 @@ pushing to $TESTTMP/other searching for changes abort: push includes an unstable changeset: 9ac5d0e790a2! - (use 'hg stabilize' to get a stable history or --force to ignore warnings) + (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto -ffa278c50818 the "hg stabilize" command will make this for you. +ffa278c50818 the "hg evolve" command will make this for you. It has a --dry-run option to only suggest the next move. - $ hg stabilize --dry-run + $ hg evolve --dry-run move:[15] animals atop:[14] bathroom stuff hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 @@ -741,7 +741,7 @@ $ hg log -r 'unstable()' ae45c0c3092a (draft): SPAM SPAM SPAM - $ hg stabilize --any + $ hg evolve --any move:[17] SPAM SPAM SPAM atop:[14] bathroom stuff merging shopping