--- a/tests/test-stabilize-result.t	Fri Aug 24 10:44:23 2012 +0200
+++ b/tests/test-stabilize-result.t	Fri Aug 24 11:17:18 2012 +0200
@@ -12,7 +12,7 @@
   >     '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@"
   > }
 
-Test stabilize removing the changeset being stabilized
+Test evolve removing the changeset being evolved
 
   $ hg init empty
   $ cd empty
@@ -28,7 +28,7 @@
   $ echo a >> a
   $ hg amend -m changea
   1 new unstable changesets
-  $ hg stabilize -v
+  $ hg evolve -v
   move:[2] changea
   atop:[4] changea
   hg rebase -Dr cce2c55b8965 -d 1447e1c4828d
@@ -49,7 +49,7 @@
   102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob)
   cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
 
-Test stabilize with conflict
+Test evolve with conflict
 
   $ ls
   a
@@ -69,14 +69,14 @@
   $ echo 'a' > a
   $ hg amend
   1 new unstable changesets
-  $ hg stabilize
+  $ hg evolve
   move:[5] newer a
   atop:[7] changea
   merging a
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
-  stabilize failed!
-  fix conflict and run "hg stabilize --continue"
+  evolve failed!
+  fix conflict and run "hg evolve --continue"
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a
@@ -88,12 +88,12 @@
    a
   +a
   +newer a
-  $ hg stabilize --continue
+  $ hg evolve --continue
   grafting revision 5
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -m a
-  $ hg stabilize --continue
+  $ hg evolve --continue
   grafting revision 5
 
 Stabilize of late comer with different parent
@@ -146,14 +146,14 @@
 
 Stabilize !
 
-  $ hg stabilize --any --dry-run
+  $ hg evolve --any --dry-run
   recreate:[12] newer a
   atop:[8] newer a
   hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401;
   hg update e3183e9c0961;
   hg revert --all --rev 15c83af6f3a3;
   hg commit --msg "latecomer update to %s" (no-eol)
-  $ hg stabilize --any
+  $ hg evolve --any
   recreate:[12] newer a
   atop:[8] newer a
   rebasing to destination parent: e8cc1b534401
@@ -229,14 +229,14 @@
 
 Stabilize It
 
-  $ hg stabilize -qn
+  $ hg evolve -qn
   hg update -c 3883461cc228 &&
   hg merge 4754d61bc2db && 
   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
   hg up -C 7391601a4bfa &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 3883461cc228 --template={desc}`";
-  $ hg stabilize -v
+  $ hg evolve -v
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition
@@ -247,7 +247,7 @@
   a
   a
   $ hg st
-  $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in stabilize
+  $ hg amend -d '0 0' -m 'More addition' # kill date variation XXX should be done in evolve
   $ glog
   @  22:ac6d600735a4@default(draft) bk:[] More addition
   |