diff tests/test-evolve.t @ 469:abeb17a9e313

stabilize: handle latecomer

Merge are not handled yet.

--- a/tests/test-evolve.t	Mon Aug 20 18:59:07 2012 +0200
+++ b/tests/test-evolve.t	Tue Aug 21 10:10:44 2012 +0200
@@ -298,18 +298,28 @@
   |
   o  0	: base - test
   
-  $ hg stabilize --any
-  latecomer not handled yet
-  [4]
+  $ hg stabilize --any --traceback
+  recreate:[8] another feature that rox
+  atop:[7] another feature
+  computing new diff
+  commited as 8d77fa12ab0c
   $ hg glog
-  @  8	feature-B: another feature that rox - test
+  @  9	feature-B: latecomer update to 5f4744038ed5: - test
   |
-  | o  7	: another feature - test
-  |/
+  o  7	: another feature - test
+  |
   o  6	feature-A: a nifty feature - test
   |
   o  0	: base - test
   
+  $ hg diff -r 9 -r 8
+  $ hg diff -r 9^ -r 9
+  diff --git a/main-file-1 b/main-file-1
+  --- a/main-file-1
+  +++ b/main-file-1
+  @@ -3,1 +3,1 @@
+  -Zwei
+  +deux
 
   $ cd ..