--- a/tests/test-evolve.t	Sat Feb 09 18:07:49 2013 +0100
+++ b/tests/test-evolve.t	Sun Feb 10 12:10:32 2013 +0000
@@ -58,7 +58,8 @@
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public stable
   $ hg kill 1
-  abort: cannot obsolete immutable changeset: 7c3bad9141dc
+  abort: cannot prune immutable changeset: 7c3bad9141dc
+  (see "hg help phases" for details)
   [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public stable
@@ -68,6 +69,7 @@
   $ hg id -n
   5
   $ hg kill .
+  1 changesets pruned
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at fbb94e3a0ecf
   $ hg qlog
@@ -80,6 +82,7 @@
 test multiple kill
 
   $ hg kill 4 -r 3
+  2 changesets pruned
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at 7c3bad9141dc
   $ hg qlog
@@ -94,6 +97,7 @@
   $ echo 4 > g
   $ hg add g
   $ hg kill .
+  1 changesets pruned
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at 7c3bad9141dc
   $ hg st
@@ -233,9 +237,6 @@
 
   $ hg phase --public 0 -v
   phase changed for 1 changesets
-  $ hg amend -c 4
-  abort: cannot amend non ancestor changeset
-  [255]
 
 
 (amend of on ancestors)
@@ -264,10 +265,10 @@
   @  0:e55e0562ee93@default(public) base
   
   $ hg debugobsolete
-  524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob)
   7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob)
-  e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob)
+  524e478d4811d405c8771e4c441de4483bdf8b33 0 {'date': '* *', 'user': 'test'} (glob)
   568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob)
+  e416e48b27428695d00c2a2cc4a0b9619482e63f 0 {'date': '* *', 'user': 'test'} (glob)
   $ hg evolve
   move:[4] another feature
   atop:[6] a nifty feature
@@ -589,7 +590,10 @@
   $ hg fold
   no revision to fold
   [1]
-  $ hg fold 6::10
+  $ hg fold 6 --rev 10
+  abort: cannot specify both --rev and a target revision
+  [255]
+  $ hg fold 6 # want to run hg fold 6
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
@@ -615,7 +619,7 @@
 
   $ hg up 4
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg fold 4::11
+  $ hg fold --rev 4::11
   3 changesets folded
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog