diff -r 3295353b1363 -r 5f6e78aea094 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Tue Jun 23 16:50:06 2015 -0700
+++ b/tests/test-stabilize-result.t	Thu Jun 25 16:55:27 2015 -0700
@@ -158,20 +158,20 @@
 
 Stabilize!
 
-  $ hg evolve --any --dry-run
+  $ hg evolve --any --dry-run --bumped
   recreate:[12] newer a
   atop:[8] newer a
   hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
   hg update 1cf0aacfd363;
   hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
   hg commit --msg "bumped update to %s" (no-eol)
-  $ hg evolve --any --confirm
+  $ hg evolve --any --confirm --bumped
   recreate:[12] newer a
   atop:[8] newer a
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve --any --confirm --config ui.interactive=True
+  $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped
   recreate:[12] newer a
   atop:[8] newer a
   perform evolve? [Ny] y
@@ -224,6 +224,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
+  (use "hg evolve" to update to its successor)
   $ mv a a.old
   $ echo 'jungle' > a
   $ cat a.old >> a
@@ -248,14 +249,14 @@
 
 Stabilize it
 
-  $ hg evolve -qn --confirm
+  $ hg evolve -qn --confirm --divergent
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve -qn --confirm --config ui.interactive=True
+  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --divergent
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition
@@ -266,7 +267,7 @@
   hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
-  $ hg evolve -v
+  $ hg evolve -v --divergent
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition
@@ -335,6 +336,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
+  (use "hg evolve" to update to its successor)
   $ echo 'gotta break' >> a
   $ hg amend
   2 new divergent changesets
@@ -343,14 +345,14 @@
   $ hg phase 'divergent()'
   21: draft
   24: draft
-  $ hg evolve -qn
+  $ hg evolve -qn --divergent
   hg update -c 0b336205a5d0 &&
   hg merge f344982e63c4 &&
   hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&&
   hg up -C 3932c176bbaa &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
-  $ hg evolve
+  $ hg evolve --divergent
   merge:[24] More addition (2)
   with: [21] More addition
   base: [15] More addition