diff -r dd0d2e90e653 -r 5a796d753427 tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Mar 22 00:56:48 2018 +0100
+++ b/tests/test-evolve.t	Thu Mar 15 00:09:24 2018 +0530
@@ -574,7 +574,7 @@
 
   $ cd ..
 
-Test graft --obsolete/--old-obsolete
+Normal testing
 
   $ hg init test-graft
   $ cd test-graft
@@ -596,14 +596,16 @@
   |/
   o  0:8685c6d34325@default(draft) add 0
   
-  $ hg graft -r3 -O
-  grafting 3:0e84df4912da "add 3"
-  $ hg graft -r1 -o 2
+  $ hg grab -r3
+  grabbing 3:0e84df4912da "add 3"
+  $ hg graft -r1
   grafting 1:73d38bb17fd7 "add 1"
+  $ hg prune -r2 --succ .
+  1 changesets pruned
   $ glog --hidden
-  @  6:acb28cd497b7@default(draft) add 1
+  @  6:417185465d2c@default(draft) add 1
   |
-  o  5:0b9e50c35132@default(draft) add 3
+  o  5:fa455b5098e0@default(draft) add 3
   |
   o  4:ce341209337f@default(draft) add 4
   |
@@ -616,39 +618,37 @@
   o  0:8685c6d34325@default(draft) add 0
   
   $ hg debugobsolete
-  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'}
-  db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'}
+  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
+  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
 
-Test graft --continue
+Test grab --continue
 
   $ hg up -qC 0
   $ echo 2 > 1
   $ hg ci -Am conflict 1
   created new head
   $ hg up -qC 6
-  $ hg graft -O 7
-  grafting 7:a5bfd90a2f29 "conflict" (tip)
+  $ hg grab -r 7
+  grabbing 7:a5bfd90a2f29 "conflict"
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
-  abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue')
-  [255]
+  unresolved merge conflicts (see hg help resolve)
+  [1]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
   $ echo 3 > 1
   $ hg resolve -m 1
   (no more unresolved files)
-  continue: hg graft --continue
-  $ hg graft --continue -O
-  grafting 7:a5bfd90a2f29 "conflict" (tip)
+  continue: hg grab --continue
+  $ hg grab --continue
   $ glog --hidden
-  @  8:920e58bb443b@default(draft) conflict
+  @  8:fb2c0f0a0c54@default(draft) conflict
   |
   | x  7:a5bfd90a2f29@default(draft) conflict
   | |
-  o |  6:acb28cd497b7@default(draft) add 1
+  o |  6:417185465d2c@default(draft) add 1
   | |
-  o |  5:0b9e50c35132@default(draft) add 3
+  o |  5:fa455b5098e0@default(draft) add 3
   | |
   o |  4:ce341209337f@default(draft) add 4
   |/
@@ -661,18 +661,18 @@
   o  0:8685c6d34325@default(draft) add 0
   
   $ hg debugobsolete
-  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'}
-  db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'}
-  a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'amend', 'user': 'test'}
+  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
+  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+  a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'grab', 'user': 'test'}
 
 Test touch
 
   $ glog
-  @  8:920e58bb443b@default(draft) conflict
+  @  8:fb2c0f0a0c54@default(draft) conflict
   |
-  o  6:acb28cd497b7@default(draft) add 1
+  o  6:417185465d2c@default(draft) add 1
   |
-  o  5:0b9e50c35132@default(draft) add 3
+  o  5:fa455b5098e0@default(draft) add 3
   |
   o  4:ce341209337f@default(draft) add 4
   |
@@ -684,9 +684,9 @@
   $ glog
   @  9:*@default(draft) conflict (glob)
   |
-  o  6:acb28cd497b7@default(draft) add 1
+  o  6:417185465d2c@default(draft) add 1
   |
-  o  5:0b9e50c35132@default(draft) add 3
+  o  5:fa455b5098e0@default(draft) add 3
   |
   o  4:ce341209337f@default(draft) add 4
   |
@@ -698,9 +698,9 @@
   $ glog
   @  10:*@default(draft) conflict (glob)
   |
-  o  6:acb28cd497b7@default(draft) add 1
+  o  6:417185465d2c@default(draft) add 1
   |
-  o  5:0b9e50c35132@default(draft) add 3
+  o  5:fa455b5098e0@default(draft) add 3
   |
   o  4:ce341209337f@default(draft) add 4
   |
@@ -765,14 +765,14 @@
   $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
   @    d26d339c513f (12) add 4
   |\
-  x |    af636757ce3b (11) add 3
-  |\ \     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  | | |
-  | \ \
-  | |\ \
-  | | | x  ce341209337f (4) add 4
-  | | |      rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  | | |
+  x |  ce341209337f (4) add 4
+   /     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |
+  x    cf0c3904643c (11) add 3
+  |\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
+  | \
+  | |\
 
 Test obsstore stat
 
@@ -793,7 +793,7 @@
           smallest length:           90
           longer length:             92
           median length:             91
-          mean length:               91
+          mean length:               90
       format v0:
           smallest length:           * (glob)
           longer length:             * (glob)