diff tests/test-stabilize-order.t @ 468:6b1b6d338478

stabilize: rework stabilize code to allow selection of latecomer and conflicting They are still unhandled but the tool now explicitly state this fact.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 20 Aug 2012 18:59:07 +0200
parents 3f8c11865ed2
children 2111c655b4f5
line wrap: on
line diff
--- a/tests/test-stabilize-order.t	Mon Aug 20 15:43:57 2012 +0200
+++ b/tests/test-stabilize-order.t	Mon Aug 20 18:59:07 2012 +0200
@@ -118,7 +118,7 @@
   o  0:c471ef929e6a@default(draft) addroot
   
   $ hg stabilize -v
-  no unstable changeset
+  no troubled changeset
   [1]
 
 Test behaviour with --any
@@ -143,7 +143,7 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg stabilize -v
   nothing to stabilize here
-  (1 unstable changesets, do you want --any ?)
+  (1 troubled changesets, do you want --any ?)
   [2]
   $ hg stabilize --any -v
   move:[9] addc
@@ -165,5 +165,5 @@
   o  0:c471ef929e6a@default(draft) addroot
   
   $ hg stabilize --any -v
-  no unstable changeset
+  no troubled changeset
   [1]