--- a/tests/test-evolve.t	Fri Jun 19 14:32:54 2015 -0700
+++ b/tests/test-evolve.t	Fri Jun 19 14:26:33 2015 -0700
@@ -880,8 +880,8 @@
   $ hg up 8
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg evolve
-  nothing to evolve here
-  (2 troubled changesets, do you want --any ?)
+  nothing to evolve on current working copy parent
+  (2 other unstable in the repository, do you want --any or --rev)
   [2]
 
 
@@ -1017,12 +1017,13 @@
 
 Evolving an empty revset should do nothing
   $ hg evolve --rev "16 and 15"
-  abort: no troubled changes in the specified revisions
-  [255]
+  set of specified revisions is empty
+  [1]
 
   $ hg evolve --rev "14::" --bumped
-  abort: no troubled changes in the specified revisions
-  [255]
+  no bumped changesets in specified revisions
+  (do you want to use --unstable)
+  [2]
   $ hg evolve --rev "14::" --unstable
   move:[15] add gg
   atop:[18] a3