--- a/tests/test-stabilize-order.t	Sat Jun 01 02:30:14 2019 +0200
+++ b/tests/test-stabilize-order.t	Tue Jun 04 11:08:44 2019 +0200
@@ -62,7 +62,7 @@
 
 Test stabilizing a predecessor child
 
-  $ hg evolve -v
+  $ hg evolve -v --rev 'last(orphan())'
   move:[4] addb
   atop:[5] adda
   hg rebase -r 22619daeed78 -d 005fe5914f78
@@ -72,11 +72,12 @@
   b
   committing manifest
   committing changelog
-  working directory is now at 81b8bbcd5892
+  resolving manifests
+  removing b
   $ glog
-  @  6:81b8bbcd5892@default(draft) addb
+  o  6:81b8bbcd5892@default(draft) addb
   |
-  o  5:005fe5914f78@default(draft) adda
+  @  5:005fe5914f78@default(draft) adda
   |
   | *  3:7a7552255fb5@default(draft) addc
   | |
@@ -89,10 +90,8 @@
 
 Test stabilizing a descendant predecessor's child
 
-  $ hg up -r 005fe5914f78
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete > successors.old
-  $ hg evolve -v
+  $ hg evolve -v --update
   move:[3] addc
   atop:[6] addb
   hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
@@ -239,7 +238,7 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     addroot
   
-  $ hg evolve
+  $ hg evolve --no-all
   abort: multiple evolve candidates
   (select one of *, * with --rev) (glob)
   [255]