--- a/tests/test-touch.t	Wed Mar 21 16:06:17 2018 +0100
+++ b/tests/test-touch.t	Wed Mar 21 16:18:31 2018 +0100
@@ -18,7 +18,7 @@
 Basic usage
 
   $ hg log -G
-  @  0:[0-9a-f]{12} a (re)
+  @  0:e93df3427f45 a
   
   $ hg touch .
   $ hg log -G
@@ -36,7 +36,7 @@
   working directory parent is obsolete! (*) (glob)
   (use 'hg evolve' to update to its successor: *) (glob)
   $ hg log -G
-  o  2:[0-9a-f]{12} ab (re)
+  o  3:[0-9a-f]{12} ab (re)
   
   @  1:[0-9a-f]{12} a (re)
   
@@ -44,24 +44,22 @@
   [1] a
   reviving this changeset will create divergence unless you make a duplicate.
   (a)llow divergence or (d)uplicate the changeset?  a
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
-  @  3:[0-9a-f]{12} a (re)
+  @  4:[0-9a-f]{12} a (re)
   
-  o  2:[0-9a-f]{12} ab (re)
+  o  3:[0-9a-f]{12} ab (re)
   
   $ hg prune 3
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory now at 000000000000
   1 changesets pruned
 
 Duplicate
 
   $ hg touch --duplicate .
   $ hg log -G
-  @  4:[0-9a-f]{12} (re)
+  @  5:[0-9a-f]{12} a (re)
   
-  o  2:[0-9a-f]{12} ab (re)
+  o  4:[0-9a-f]{12} a (re)
   
 
 Multiple touch
@@ -73,23 +71,23 @@
   $ hg add d
   $ hg commit -m d
   $ hg log -G
-  @  6:[0-9a-f]{12} d (re)
+  @  7:[0-9a-f]{12} d (re)
   |
-  o  5:[0-9a-f]{12} c (re)
+  o  6:[0-9a-f]{12} c (re)
   |
-  o  4:[0-9a-f]{12} (re)
+  o  5:[0-9a-f]{12} a (re)
   
-  o  2:[0-9a-f]{12} ab (re)
+  o  4:[0-9a-f]{12} a (re)
   
-  $ hg touch .^:.
+  $ hg touch 6:7
   $ hg log -G
-  @  8:[0-9a-f]{12} d (re)
+  @  9:[0-9a-f]{12} d (re)
   |
-  o  7:[0-9a-f]{12} c (re)
+  o  8:[0-9a-f]{12} c (re)
   |
-  o  4:[0-9a-f]{12} (re)
+  o  5:[0-9a-f]{12} a (re)
   
-  o  2:[0-9a-f]{12} ab (re)
+  o  4:[0-9a-f]{12} a (re)
   
 
 check move data kept after rebase on touch:
@@ -107,36 +105,10 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   $ hg touch
-  1 new orphan changesets
+  1 new unstable changesets
 
-  $ hg log -G --hidden
-  @  11:[0-9a-f]{12} gna1 (re)
-  |
-  . o  10:[0-9a-f]{12} move (re)
-  | |
-  . x  9:[0-9a-f]{12} gna1 (re)
-  |/
-  o  8:[0-9a-f]{12} d (re)
-  |
-  o  7:[0-9a-f]{12} c (re)
-  |
-  . x  6:[0-9a-f]{12} d (re)
-  | |
-  . x  5:[0-9a-f]{12} c (re)
-  |/
-  o  4:[0-9a-f]{12} (re)
-  
-  x  3:[0-9a-f]{12} a (re)
-  
-  o  2:[0-9a-f]{12} ab (re)
-  
-  x  1:[0-9a-f]{12} a (re)
-  
-  x  0:[0-9a-f]{12} a (re)
-  
-
-  $ hg rebase -s 10 -d 11
-  rebasing 10:[0-9a-f]{12} "move" (re)
+  $ hg rebase -s 11 -d 12
+  rebasing 11:* "move" (glob)
   $ hg st -C --change=tip
   A gna2
     gna1
@@ -144,18 +116,17 @@
 
 check that the --duplicate option does not create divergence
 
-  $ hg touch --duplicate 10 --hidden
-  1 new orphan changesets
+  $ hg touch --duplicate 11 --hidden
+  1 new unstable changesets
 
 check that reviving a changeset with no successor does not show the prompt
 
-  $ hg prune 13
+  $ hg prune 14
   1 changesets pruned
-  $ hg touch 13 --hidden --note "testing with no successor"
-  1 new orphan changesets
-  $ hg obslog -r 13 --hidden
+  $ hg touch 14 --hidden
+  1 new unstable changesets
+  $ hg obslog -r 14 --hidden
   x  [0-9a-f]{12} (.*) move (re)
-       pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re)
-         note: testing with no successor
+       pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(.*) as [0-9a-f]{12} by test (.*) (re)