diff -r 232990fbecb5 -r c017ad874dfc tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Jun 20 18:04:50 2012 +0200
+++ b/tests/test-evolve.t	Wed Jun 27 15:12:19 2012 +0200
@@ -23,6 +23,10 @@
   >    hg ci -m "add $1"
   > }
 
+  $ glog() {
+  >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
+  > }
+
 various init
 
   $ hg init local
@@ -52,7 +56,9 @@
 
 test simple kill
 
-  $ hg kill 5
+  $ hg id -n
+  5
+  $ hg kill .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at fbb94e3a0ecf
   $ hg qlog
@@ -71,6 +77,18 @@
   2 - 4538525df7e2 add c (draft)
   1 - 7c3bad9141dc add b (public)
   0 - 1f0dee641bb7 add a (public)
+
+test kill with dirty changes
+
+  $ hg up 2
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo 4 > g
+  $ hg add g
+  $ hg kill .
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  working directory now at 7c3bad9141dc
+  $ hg st
+  A g
   $ cd ..
 
 ##########################
@@ -209,8 +227,27 @@
   4	feature-B: another feature - test
   1	: a nifty feature - test
   0	: base - test
-  $ hg up -q 1
-  Working directory parent is obsolete
+  $ hg up -q 0
+  $ glog --hidden
+  o  6:23409eba69a0@default(draft) a nifty feature
+  |
+  | o  5:e416e48b2742@default(secret) french looks better
+  | |
+  | | o  4:f8111a076f09@default(draft) another feature
+  | |/
+  | | o  3:524e478d4811@default(secret) fix spelling of Zwei
+  | | |
+  | | o  2:7b36850622b2@default(secret) another feature
+  | |/
+  | o  1:568a468b60fc@default(draft) a nifty feature
+  |/
+  @  0:e55e0562ee93@default(draft) base
+  
+  $ hg debugsuccessors
+  524e478d4811 f8111a076f09
+  568a468b60fc 23409eba69a0
+  7b36850622b2 f8111a076f09
+  e416e48b2742 23409eba69a0
   $ hg stabilize
   move:[4] another feature
   atop:[6] a nifty feature
@@ -234,6 +271,12 @@
   8	feature-B: another feature that rox - test
   6	feature-A: a nifty feature - test
   0	: base - test
+
+phase change turning obsolete changeset public issue a latecomer warning
+
+  $ hg phase --public 7
+  1 new latecomers changesets
+
   $ cd ..
 
 enable general delta