--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -21,12 +21,13 @@
   $ hg amend -d '0 0'
   $ hg debugobsolete
   07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+  b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob)
   $ hg branch
   foo
   $ hg branches
-  foo                            1:6a022cbb61d5
+  foo                            2:6a022cbb61d5
   $ glog
-  @  1@foo(draft) adda
+  @  2@foo(draft) adda
   
 Test no-op
 
@@ -34,7 +35,7 @@
   nothing changed
   [1]
   $ glog
-  @  1@foo(draft) adda
+  @  2@foo(draft) adda
   
 
 Test forcing the message to the same value, no intermediate revision.
@@ -43,7 +44,7 @@
   nothing changed
   [1]
   $ glog
-  @  1@foo(draft) adda
+  @  2@foo(draft) adda
   
 
 Test collapsing into an existing revision, no intermediate revision.
@@ -65,19 +66,20 @@
   $ hg ci -m reseta
   $ hg debugobsolete
   07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+  b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob)
   $ hg phase 2
   2: draft
   $ glog
-  @  3@foo(draft) reseta
+  @  4@foo(draft) reseta
   |
-  o  2@foo(draft) changea
+  o  3@foo(draft) changea
   |
-  o  1@foo(draft) adda
+  o  2@foo(draft) adda
   
 Specify precise commit date with -d
   $ hg amend -d '2001-02-03 04:05:06 +0700'
   $ hg parents --template '{rev}  {date|date}\n'
-  4  Sat Feb 03 04:05:06 2001 +0700
+  5  Sat Feb 03 04:05:06 2001 +0700
 
 Specify "now" as commit date with -D
   $ before=`date +%s`
@@ -86,13 +88,13 @@
   $ after=`date +%s`
   $ (echo $before ; echo $commit; echo $after) | sort -k1 -n -s
   \d+ (re)
-  \d+ 0 rev5 (re)
+  \d+ 0 rev6 (re)
   \d+ (re)
 
 Specify current user as committer with -U
   $ HGUSER=newbie hg amend -U
   $ hg parents --template '{rev}  {author}\n'
-  6  newbie
+  7  newbie
 
 Check that --logfile works
   $ echo "logfile message" > logfile.txt
@@ -107,7 +109,7 @@
   (use 'hg config --edit' to set your username)
   [255]
   $ hg sum
-  parent: 7:* tip (glob)
+  parent: 8:* tip (glob)
    logfile message
   branch: foo
   commit: 1 unknown (clean)

--- a/tests/test-discovery-obshashrange.t
+++ b/tests/test-discovery-obshashrange.t
@@ -31,7 +31,6 @@
   $ cd server
   $ hg debugbuilddag '.+7'
   $ hg blackbox
-  * @0000000000000000000000000000000000000000 (*)> init server exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob)
@@ -137,7 +136,6 @@
   adding file changes
   added 5 changesets with 0 changes to 0 files
   3 new obsolescence markers
-  new changesets 1ea73414a91b:bebd167eb94d
   (run 'hg update' to get a working copy)
   $ hg -R ../server blackbox
   * @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip (glob)
@@ -153,7 +151,6 @@
   cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   $ rm ../server/.hg/blackbox.log
   $ hg blackbox
-  * @0000000000000000000000000000000000000000 (*)> clone 'ssh://user@dummy/server' client exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
   * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 3o) (glob)
@@ -183,8 +180,8 @@
   running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob)
   sending hello command
   sending between command
-  remote: 533
-  remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
+  remote: 516
+  remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v0 _evoext_pullobsmarkers_0 _evoext_pushobsmarkers_0 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
   remote: 1
   preparing listkeys for "phases"
   sending listkeys command
@@ -218,9 +215,9 @@
   45f8b879de922f6a6e620ba04205730335b6fc7e
   sending unbundle command
   bundle2-output-bundle: "HG20", 4 parts total
-  bundle2-output-part: "replycaps" 185 bytes payload
+  bundle2-output-part: "replycaps" 172 bytes payload
   bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
-  bundle2-output-part: "phase-heads" 24 bytes payload
+  bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
   bundle2-output-part: "obsmarkers" streamed payload
   remote: adding changesets
   remote: adding manifests
@@ -229,8 +226,9 @@
   remote: 1 new obsolescence markers
   bundle2-input-bundle: no-transaction
   bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
+  bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
   bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
-  bundle2-input-bundle: 1 parts total
+  bundle2-input-bundle: 2 parts total
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 58 bytes
@@ -371,7 +369,6 @@
   adding file changes
   added 2 changesets with 0 changes to 0 files (+1 heads)
   3 new obsolescence markers
-  new changesets c8d03c1b5e94:f69452c5b1af
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg -R ../server blackbox
@@ -549,7 +546,6 @@
   adding file changes
   added 1 changesets with 0 changes to 0 files
   1 new obsolescence markers
-  new changesets 4de32a90b66c
   (run 'hg update' to get a working copy)
   $ hg rollback
   repository tip rolled back to revision 7 (undo pull)
@@ -600,7 +596,6 @@
   adding file changes
   added 1 changesets with 0 changes to 0 files
   1 new obsolescence markers
-  new changesets 4de32a90b66c
   (run 'hg update' to get a working copy)
   $ hg blackbox
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob)
@@ -692,7 +687,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  new changesets 45f8b879de92
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -G
   o  8 45f8b879de92 foo tip

--- a/tests/test-divergent.t
+++ b/tests/test-divergent.t
@@ -45,7 +45,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |
@@ -62,7 +62,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at c26f1d3baed2
   $ hg log -G
-  @  4:c26f1d3baed2@default(draft) add bdivergent1 []
+  @  5:c26f1d3baed2@default(draft) add bdivergent1 []
   |
   o  0:135f39f4bd78@default(draft) add _a []
   
@@ -88,25 +88,24 @@
   1 changesets pruned
   $ hg prune -s "desc(cdivergent2)" "desc(_c)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
-  @  7:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
+  @  8:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
   |
-  | o  6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
+  | o  7:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
   |/
-  | o  4:c26f1d3baed2@default(draft) add bdivergent1 []
+  | o  5:c26f1d3baed2@default(draft) add bdivergent1 []
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
   $ hg evolve --all --any --contentdivergent
-  merge:[6] add cdivergent1
-  with: [7] cdivergent2
-  base: [5] add _c
+  merge:[7] add cdivergent1
+  with: [8] cdivergent2
+  base: [6] add _c
   updating to "local" conflict
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  nothing changed
-  working directory is now at 26c7705fee96
+  working directory is now at 6602ff5a79dc
 
 Test None docstring issue of evolve divergent, which caused hg crush
 
@@ -125,7 +124,7 @@
   1 changesets pruned
   $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log -G
   @  3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
   |

--- a/tests/test-drop.t
+++ b/tests/test-drop.t
@@ -178,7 +178,7 @@
   $ hg commit --amend
   $ summary
   ============ graph ==============
-  @  changeset:   3:a2c06c884bfe
+  @  changeset:   4:a2c06c884bfe
   |  tag:         tip
   |  parent:      1:19509a42b0d0
   |  user:        test
@@ -196,17 +196,23 @@
      summary:     add base
   
   ============ hidden =============
-  @  changeset:   3:a2c06c884bfe
+  @  changeset:   4:a2c06c884bfe
   |  tag:         tip
   |  parent:      1:19509a42b0d0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add child
   |
+  | x  changeset:   3:87ea30a976fd
+  | |  user:        test
+  | |  date:        Thu Jan 01 00:00:00 1970 +0000
+  | |  obsolete:    pruned
+  | |  summary:     temporary amend commit for 34b6c051bf1f
+  | |
   | x  changeset:   2:34b6c051bf1f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended using amend as 3:a2c06c884bfe
+  |    obsolete:    amended as a2c06c884bfe
   |    summary:     add child
   |
   o  changeset:   1:19509a42b0d0
@@ -221,6 +227,7 @@
   
   ============ obsmark ============
   34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+  87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob)
   $ hg drop .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at 19509a42b0d0

--- a/tests/test-evolve-bumped.t
+++ b/tests/test-evolve-bumped.t
@@ -49,7 +49,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 4d1169d82e47
   (run 'hg update' to get a working copy)
   $ hg log -r 'draft()'
   1:4d1169d82e47@default(draft) modify a
@@ -68,7 +67,7 @@
   pulling from ../public
   searching for changes
   no changes found
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
   $ hg evolve -a -A --phasedivergent
   recreate:[2] tweak a
@@ -106,7 +105,7 @@
   $ hg commit -m "merge"
   $ hg commit --amend -m "New message"
   $ hg phase --public 551127da2a8a --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg log -G
   @    7:b28e84916d8c@default(draft) New message
   |\

--- a/tests/test-evolve-cycles.t
+++ b/tests/test-evolve-cycles.t
@@ -50,7 +50,7 @@
 Create a cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune -s "desc(A)" "desc(C)"
@@ -62,19 +62,19 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 1:2a34000d3544
+  |  obsolete:    rewritten as 2a34000d3544
   |  summary:     C
   |
   x  changeset:   2:c473644ee0e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 3:a8df460dbbfe
+  |  obsolete:    rewritten as a8df460dbbfe
   |  summary:     B
   |
   @  changeset:   1:2a34000d3544
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 2:c473644ee0e9
+  |  obsolete:    rewritten as c473644ee0e9
   |  summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -188,7 +188,7 @@
 Create a first cycle
   $ hg prune -s "desc(B)" "desc(A)"
   1 changesets pruned
-  5 new orphan changesets
+  5 new unstable changesets
   $ hg prune -s "desc(C)" "desc(B)"
   1 changesets pruned
   $ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
@@ -207,37 +207,37 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 4:868d2e0eb19c
+  |  obsolete:    rewritten as 868d2e0eb19c
   |  summary:     F
   |
   x  changeset:   5:0da815c333f6
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 6:d9f908fde1a1
+  |  obsolete:    rewritten as d9f908fde1a1
   |  summary:     E
   |
   @  changeset:   4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 5:0da815c333f6
+  |  obsolete:    rewritten as 0da815c333f6
   |  summary:     D
   |
   x  changeset:   3:a8df460dbbfe
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    split as 1:2a34000d3544, 4:868d2e0eb19c
+  |  obsolete:    split as 2a34000d3544, 868d2e0eb19c
   |  summary:     C
   |
   x  changeset:   2:c473644ee0e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 3:a8df460dbbfe
+  |  obsolete:    rewritten as a8df460dbbfe
   |  summary:     B
   |
   x  changeset:   1:2a34000d3544
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 2:c473644ee0e9
+  |  obsolete:    rewritten as c473644ee0e9
   |  summary:     A
   |
   o  changeset:   0:ea207398892e

--- a/tests/test-evolve-effectflags.t
+++ b/tests/test-evolve-effectflags.t
@@ -29,7 +29,7 @@
 check result
 
   $ hg debugobsolete --rev .
-  471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
+  471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob)
   $ hg obslog .
   @  fdf9bde5129a (2) A1
   |
@@ -40,7 +40,7 @@
   changeset:   1:471f378eab4c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reworded using amend as 2:fdf9bde5129a
+  obsolete:    reworded as fdf9bde5129a
   summary:     A0
   
 
@@ -53,7 +53,7 @@
 check result
 
   $ hg debugobsolete --rev .
-  ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'}
+  ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob)
   $ hg obslog .
   @  5485c92d3433 (4) B0
   |
@@ -64,7 +64,7 @@
   changeset:   3:ef4a313b1e0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reauthored using amend as 4:5485c92d3433
+  obsolete:    reauthored as 5485c92d3433
   summary:     B0
   
 
@@ -77,7 +77,7 @@
 check result
 
   $ hg debugobsolete --rev .
-  2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'}
+  2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob)
   $ hg obslog .
   @  4dd84345082e (6) B1
   |
@@ -88,7 +88,7 @@
   changeset:   5:2ef0680ff450
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    date-changed using amend as 6:4dd84345082e
+  obsolete:    date-changed as 4dd84345082e
   summary:     B1
   
 
@@ -104,9 +104,10 @@
 check result
 
   $ hg debugobsolete --rev .
-  bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'}
+  4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (*) {'ef1': '0', 'user': 'test'} (glob)
+  bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
   $ hg obslog .
-  @  14a01456e057 (8) B2
+  @  14a01456e057 (9) B2
   |
   x  bd3db8264cee (7) B2
        rewritten(branch) as 14a01456e057 by test (*) (glob)
@@ -115,7 +116,7 @@
   changeset:   7:bd3db8264cee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    branch-changed using amend as 8:14a01456e057
+  obsolete:    branch-changed as 14a01456e057
   summary:     B2
   
 
@@ -128,23 +129,23 @@
   $ mkcommit C0
   $ mkcommit D0
   $ hg rebase -r . -d 'desc(B0)'
-  rebasing 10:c85eff83a034 "D0" (tip)
+  rebasing 11:c85eff83a034 "D0" (tip)
 
 check result
 
   $ hg debugobsolete --rev .
-  c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
   $ hg obslog .
-  @  da86aa2f19a3 (11) D0
+  @  da86aa2f19a3 (12) D0
   |
-  x  c85eff83a034 (10) D0
+  x  c85eff83a034 (11) D0
        rewritten(parent) as da86aa2f19a3 by test (*) (glob)
   
   $ hg log --hidden -r "c85eff83a034"
-  changeset:   10:c85eff83a034
+  changeset:   11:c85eff83a034
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased using rebase as 11:da86aa2f19a3
+  obsolete:    rebased as da86aa2f19a3
   summary:     D0
   
 
@@ -158,18 +159,19 @@
 check result
 
   $ hg debugobsolete --rev .
-  ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (*) {'ef1': '0', 'user': 'test'} (glob)
+  ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
   $ hg obslog .
-  @  75781fdbdbf5 (13) E0
+  @  75781fdbdbf5 (15) E0
   |
-  x  ebfe0333e0d9 (12) E0
+  x  ebfe0333e0d9 (13) E0
        rewritten(content) as 75781fdbdbf5 by test (*) (glob)
   
   $ hg log --hidden -r "ebfe0333e0d9"
-  changeset:   12:ebfe0333e0d9
+  changeset:   13:ebfe0333e0d9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    amended using amend as 13:75781fdbdbf5
+  obsolete:    amended as 75781fdbdbf5
   summary:     E0
   
 
@@ -184,18 +186,19 @@
 check result
 
   $ hg debugobsolete --rev .
-  fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'}
+  3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (*) {'ef1': '0', 'user': 'test'} (glob)
+  fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
   $ hg obslog .
-  @  a94e0fd5f1c8 (15) F1
+  @  a94e0fd5f1c8 (18) F1
   |
-  x  fad47e5bd78e (14) F0
+  x  fad47e5bd78e (16) F0
        rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (*) (glob)
   
   $ hg log --hidden -r "fad47e5bd78e"
-  changeset:   14:fad47e5bd78e
+  changeset:   16:fad47e5bd78e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rewritten using amend as 15:a94e0fd5f1c8
+  obsolete:    rewritten as a94e0fd5f1c8
   summary:     F0
   
 
@@ -238,20 +241,20 @@
   $ hg commit -m "H2"
   created new head
   $ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3
-  rebasing 17:b57fed8d8322 "H1"
+  rebasing 20:b57fed8d8322 "H1"
   merging H0
   $ hg obslog tip
-  o  e509e2eb3df5 (19) H1
+  o  e509e2eb3df5 (22) H1
   |
-  x  b57fed8d8322 (17) H1
+  x  b57fed8d8322 (20) H1
        rewritten(parent) as e509e2eb3df5 by test (*) (glob)
   
   $ hg log --hidden -r "b57fed8d8322"
-  changeset:   17:b57fed8d8322
+  changeset:   20:b57fed8d8322
   branch:      my-other-branch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased using rebase as 19:e509e2eb3df5
+  obsolete:    rebased as e509e2eb3df5
   summary:     H1
   
 amend closing the branch should be detected as meta change
@@ -266,16 +269,16 @@
 check result
 
   $ hg obslog .
-  @  12c6238b5e37 (22) I0
+  @  12c6238b5e37 (26) I0
   |
-  x  2f599e54c1c6 (21) I0
+  x  2f599e54c1c6 (24) I0
        rewritten(meta) as 12c6238b5e37 by test (*) (glob)
   
   $ hg log --hidden -r "2f599e54c1c6"
-  changeset:   21:2f599e54c1c6
+  changeset:   24:2f599e54c1c6
   branch:      closedbranch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    meta-changed using amend as 22:12c6238b5e37
+  obsolete:    meta-changed as 12c6238b5e37
   summary:     I0
   

--- a/tests/test-evolve-list.t
+++ b/tests/test-evolve-list.t
@@ -17,7 +17,7 @@
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a >> a && hg ci --amend -m a
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve --list
   d2ae7f538514: b
     unstable: cb9a9f314b8b (obsolete parent)
@@ -34,7 +34,7 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg evolve --list
   88cc282e27fc: ab
     bumped: cb9a9f314b8b (immutable precursor)
@@ -64,7 +64,7 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg evolve --list
   c882616e9d84: b
     divergent: a922b3733e98 (draft) (precursor d2ae7f538514)

--- a/tests/test-evolve-obshistory-complex.t
+++ b/tests/test-evolve-obshistory-complex.t
@@ -68,7 +68,7 @@
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
   2 changesets folded
-  4 new orphan changesets
+  4 new unstable changesets
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2"
@@ -80,14 +80,14 @@
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   7:b868bc49b0a4
@@ -99,25 +99,25 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rewritten as 8:d15d0ffc75f6
+  | | |  obsolete:    rewritten as d15d0ffc75f6
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten as 8:d15d0ffc75f6
+  | |    obsolete:    rewritten as d15d0ffc75f6
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as 7:b868bc49b0a4
+  | |  obsolete:    rewritten as b868bc49b0a4
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 7:b868bc49b0a4
+  |    obsolete:    rewritten as b868bc49b0a4
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -236,27 +236,27 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   11:e036916b63ea
@@ -273,25 +273,25 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    split as 12:7b3290f6e0a0, 13:d0f33db50670
+  | | |  obsolete:    split as 7b3290f6e0a0, d0f33db50670
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    split as 12:7b3290f6e0a0, 13:d0f33db50670
+  | |    obsolete:    split as 7b3290f6e0a0, d0f33db50670
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    split as 10:19e14c8397fc, 11:e036916b63ea
+  | |  obsolete:    split as 19e14c8397fc, e036916b63ea
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 10:19e14c8397fc, 11:e036916b63ea
+  |    obsolete:    split as 19e14c8397fc, e036916b63ea
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -312,21 +312,21 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: orphan
+  |  trouble:     unstable
   |  summary:     fold2
   |
   | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     fold1
   | |
   | | o  changeset:   10:19e14c8397fc
@@ -338,25 +338,25 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    split as 12:7b3290f6e0a0, 14:ec31316faa9d
+  | | |  obsolete:    split as 7b3290f6e0a0, ec31316faa9d
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    split as 12:7b3290f6e0a0, 14:ec31316faa9d
+  | |    obsolete:    split as 7b3290f6e0a0, ec31316faa9d
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    split as 10:19e14c8397fc, 12:7b3290f6e0a0
+  | |  obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 10:19e14c8397fc, 12:7b3290f6e0a0
+  |    obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
   |    summary:     A
   |
   o  changeset:   0:ea207398892e

--- a/tests/test-evolve-obshistory.t
+++ b/tests/test-evolve-obshistory.t
@@ -31,17 +31,23 @@
   > 
   > Better commit message"
   $ hg log --hidden -G
-  @  changeset:   2:4ae3a4151de9
+  @  changeset:   3:4ae3a4151de9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A1
   |
+  | x  changeset:   2:f137d23bb3e1
+  | |  user:        test
+  | |  date:        Thu Jan 01 00:00:00 1970 +0000
+  | |  obsolete:    pruned
+  | |  summary:     temporary amend commit for 471f378eab4c
+  | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using amend as 2:4ae3a4151de9
+  |    obsolete:    rewritten as 4ae3a4151de9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -52,7 +58,7 @@
 Actual test
 -----------
   $ hg obslog --patch 4ae3a4151de9
-  @  4ae3a4151de9 (2) A1
+  @  4ae3a4151de9 (3) A1
   |
   x  471f378eab4c (1) A0
        rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
@@ -74,7 +80,7 @@
   
 
   $ hg obslog --no-graph --patch 4ae3a4151de9
-  4ae3a4151de9 (2) A1
+  4ae3a4151de9 (3) A1
   471f378eab4c (1) A0
     rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
       --- a/471f378eab4c-changeset-description	
@@ -103,7 +109,7 @@
       {
           "markers": [],
           "node": "4ae3a4151de9",
-          "rev": 2,
+          "rev": 3,
           "shortdescription": "A1"
       },
       {
@@ -359,7 +365,7 @@
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a
+  |    obsolete:    split as 337fec4d2edc, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -613,7 +619,7 @@
   | x  changeset:   1:de7290d8b885
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
+  |    obsolete:    split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -789,13 +795,13 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as 3:eb5a0daa2192
+  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 3:eb5a0daa2192
+  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -996,7 +1002,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1009,28 +1015,28 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
+  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: content-divergent
+  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
-  |    obsolete:    reworded using amend as 3:65b757b745b9
+  |    obsolete:    reworded as fdf9bde5129a
+  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1312,7 +1318,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 3:b7ea6d14e664
+  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -1340,19 +1346,19 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as 4:eb5a0daa2192
+  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
+  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 4:eb5a0daa2192
+  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1576,13 +1582,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 3:7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1624,7 +1630,6 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 7a230b46bf61
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)

--- a/tests/test-evolve-order.t
+++ b/tests/test-evolve-order.t
@@ -44,9 +44,9 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo "aaa" > _a
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg log -G
-  @  4:12d519679175@default(draft) add _a
+  @  5:12d519679175@default(draft) add _a
   |
   | o  3:4d156641b718@default(draft) add _c
   | |
@@ -60,9 +60,9 @@
 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order
   $ hg evolve --rev 'desc(_c) + desc(_b)'
   move:[2] add _b
-  atop:[4] add _a
+  atop:[5] add _a
   move:[3] add _c
-  atop:[5] add _b
+  atop:[6] add _b
   working directory is now at 52b8f9b04f83
 
 evolve --rev reorders the rev to solve instability. Harder case, obsolescence
@@ -73,10 +73,10 @@
   $ hg up "desc(_a)"
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m "aprime"
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg evolve --rev "desc(_b)"
-  move:[5] add _b
-  atop:[8] aprime
+  move:[6] add _b
+  atop:[9] aprime
   working directory is now at 476c9c052aae
   $ hg up "desc(_b) - obsolete()"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -84,40 +84,40 @@
   $ hg up "desc(aprime)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m "asecond"
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
-  @  11:9a584314f3f3@default(draft) asecond
+  @  12:9a584314f3f3@default(draft) asecond
   |
-  | o  10:a59c79776f7c@default(draft) bprime
+  | o  11:a59c79776f7c@default(draft) bprime
   | |
-  | x  8:81a687b96d4d@default(draft) aprime
+  | x  9:81a687b96d4d@default(draft) aprime
   |/
-  | o  7:464731bc0ed0@default(draft) add _d
+  | o  8:464731bc0ed0@default(draft) add _d
   | |
-  | o  6:52b8f9b04f83@default(draft) add _c
+  | o  7:52b8f9b04f83@default(draft) add _c
   | |
-  | x  5:59476c3836ef@default(draft) add _b
+  | x  6:59476c3836ef@default(draft) add _b
   | |
-  | x  4:12d519679175@default(draft) add _a
+  | x  5:12d519679175@default(draft) add _a
   |/
   o  0:f92638be10c7@default(public) add p
   
   $ hg evolve --rev "orphan()"
-  move:[10] bprime
-  atop:[11] asecond
-  move:[6] add _c
-  atop:[12] bprime
-  move:[7] add _d
-  atop:[13] add _c
+  move:[11] bprime
+  atop:[12] asecond
+  move:[7] add _c
+  atop:[13] bprime
+  move:[8] add _d
+  atop:[14] add _c
   working directory is now at 739f18ac1d03
   $ hg log -G
-  @  14:739f18ac1d03@default(draft) add _d
+  @  15:739f18ac1d03@default(draft) add _d
   |
-  o  13:e5960578d158@default(draft) add _c
+  o  14:e5960578d158@default(draft) add _c
   |
-  o  12:4ad33fa88946@default(draft) bprime
+  o  13:4ad33fa88946@default(draft) bprime
   |
-  o  11:9a584314f3f3@default(draft) asecond
+  o  12:9a584314f3f3@default(draft) asecond
   |
   o  0:f92638be10c7@default(public) add p
   
@@ -131,28 +131,28 @@
   $ mkstack "desc(_d)" c1second >/dev/null
   $ hg prune "desc(c1_)" -s "desc(c1prime)"
   1 changesets pruned
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg prune "desc(c2_)" -s "desc(c2prime)"
   1 changesets pruned
   $ hg prune "desc(c1prime)" -s "desc(c1second)"
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G -r "desc(_d)::"
-  @  21:dcf786e878fd@default(draft) add c1second
+  @  22:dcf786e878fd@default(draft) add c1second
   |
-  | o  20:507d52d715f6@default(draft) add c2prime
+  | o  21:507d52d715f6@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  20:c995cb124ddc@default(draft) add c1prime
   |/
-  | o  18:d096a2437fd0@default(draft) add c4_
+  | o  19:d096a2437fd0@default(draft) add c4_
   | |
-  | o  17:cde95c6cba7a@default(draft) add c3_
+  | o  18:cde95c6cba7a@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  17:e0d9f7a099fe@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  16:43b7c338b1f8@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  15:739f18ac1d03@default(draft) add _d
   |
   ~
 
@@ -161,40 +161,40 @@
   $ mkstack "desc(_d)" b1prime b3prime >/dev/null
   $ hg prune "desc(b1_)" -s "desc(b1prime)"
   1 changesets pruned
-  3 new orphan changesets
+  3 new unstable changesets
   $ hg prune "desc(b3_)" -s "desc(b3prime)"
   1 changesets pruned
   $ hg prune "desc(b2_)"
   1 changesets pruned
 
   $ hg log -G -r "desc(_d)::"
-  @  27:b253ff5b65d1@default(draft) add b3prime
+  @  28:b253ff5b65d1@default(draft) add b3prime
   |
-  o  26:4acf61f11dfb@default(draft) add b1prime
+  o  27:4acf61f11dfb@default(draft) add b1prime
   |
-  | o  25:594e1fbbd61f@default(draft) add b4_
+  | o  26:594e1fbbd61f@default(draft) add b4_
   | |
-  | x  24:be27500cfc76@default(draft) add b3_
+  | x  25:be27500cfc76@default(draft) add b3_
   | |
-  | x  23:b54f77dc5831@default(draft) add b2_
+  | x  24:b54f77dc5831@default(draft) add b2_
   | |
-  | x  22:0e1eba27e9aa@default(draft) add b1_
+  | x  23:0e1eba27e9aa@default(draft) add b1_
   |/
-  | o  21:dcf786e878fd@default(draft) add c1second
+  | o  22:dcf786e878fd@default(draft) add c1second
   |/
-  | o  20:507d52d715f6@default(draft) add c2prime
+  | o  21:507d52d715f6@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  20:c995cb124ddc@default(draft) add c1prime
   |/
-  | o  18:d096a2437fd0@default(draft) add c4_
+  | o  19:d096a2437fd0@default(draft) add c4_
   | |
-  | o  17:cde95c6cba7a@default(draft) add c3_
+  | o  18:cde95c6cba7a@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  17:e0d9f7a099fe@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  16:43b7c338b1f8@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  15:739f18ac1d03@default(draft) add _d
   |
   ~
 
@@ -203,35 +203,35 @@
   (desc(_d)::) - desc(c3_)
   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
   cannot solve instability of d096a2437fd0, skipping
-  move:[20] add c2prime
-  atop:[21] add c1second
-  move:[25] add b4_
-  atop:[27] add b3prime
+  move:[21] add c2prime
+  atop:[22] add c1second
+  move:[26] add b4_
+  atop:[28] add b3prime
   working directory is now at ea93190a9cd1
 
 Cleanup
   $ hg evolve --rev "(desc(_d)::)"
-  move:[17] add c3_
-  atop:[28] add c2prime
-  move:[18] add c4_
-  atop:[30] add c3_
+  move:[18] add c3_
+  atop:[29] add c2prime
+  move:[19] add c4_
+  atop:[31] add c3_
   working directory is now at 35e7b797ace5
   $ hg log -G -r "desc(_d)::"
-  @  31:35e7b797ace5@default(draft) add c4_
+  @  32:35e7b797ace5@default(draft) add c4_
   |
-  o  30:0b9488394e89@default(draft) add c3_
+  o  31:0b9488394e89@default(draft) add c3_
   |
-  | o  29:ea93190a9cd1@default(draft) add b4_
+  | o  30:ea93190a9cd1@default(draft) add b4_
   | |
-  o |  28:881b9c092e53@default(draft) add c2prime
+  o |  29:881b9c092e53@default(draft) add c2prime
   | |
-  | o  27:b253ff5b65d1@default(draft) add b3prime
+  | o  28:b253ff5b65d1@default(draft) add b3prime
   | |
-  | o  26:4acf61f11dfb@default(draft) add b1prime
+  | o  27:4acf61f11dfb@default(draft) add b1prime
   | |
-  o |  21:dcf786e878fd@default(draft) add c1second
+  o |  22:dcf786e878fd@default(draft) add c1second
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  15:739f18ac1d03@default(draft) add _d
   |
   ~
 
@@ -244,22 +244,22 @@
   created new head
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [28] add c2prime
+  [29] add c2prime
   $ mkcommit c3part2
   created new head
   $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg up 'desc(b3prime)'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m 'b3second'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve --rev "orphan()"
-  move:[29] add b4_
-  atop:[34] b3second
+  move:[30] add b4_
+  atop:[35] b3second
   skipping 0b9488394e89: divergent rewriting. can't choose destination
   working directory is now at 31809a198477
 

--- a/tests/test-evolve-serveronly-bundle2.t
+++ b/tests/test-evolve-serveronly-bundle2.t
@@ -72,7 +72,6 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets 8685c6d34325:4957bfdac07e
   (run 'hg update' to get a working copy)
   $ cat ../errors.log
   $ hg push -R ../other
@@ -108,7 +107,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: 1 new obsolescence markers
+  remote: 2 new obsolescence markers
   remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
@@ -128,9 +127,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
+  2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull

--- a/tests/test-evolve-serveronly.t
+++ b/tests/test-evolve-serveronly.t
@@ -76,7 +76,6 @@
   the remote repository use years old versions of Mercurial and evolve
   pulling obsmarker using legacy method
   (please upgrade your server)
-  new changesets 8685c6d34325:4957bfdac07e
   (run 'hg update' to get a working copy)
   $ cat ../errors.log
   $ hg push -R ../other
@@ -115,8 +114,8 @@
   the remote repository use years old versions of Mercurial and evolve
   pushing obsmarker using legacy method
   (please upgrade your server)
-  pushing 1 obsolescence markers (* bytes) (glob)
-  remote: 1 obsolescence markers added
+  pushing 2 obsolescence markers (* bytes) (glob)
+  remote: 2 obsolescence markers added
   remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
@@ -140,9 +139,8 @@
   the remote repository use years old versions of Mercurial and evolve
   pulling obsmarker using legacy method
   (please upgrade your server)
-  1 obsolescence markers added
+  2 obsolescence markers added
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull

--- a/tests/test-evolve-split.t
+++ b/tests/test-evolve-split.t
@@ -44,7 +44,7 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log -G
   @  4:d0dcf24cddd3@default(draft) _pp
   |

--- a/tests/test-evolve-templates.t
+++ b/tests/test-evolve-templates.t
@@ -19,7 +19,7 @@
   >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\
   >     {if(obsfate, "\n  Fate: {join(obsfate, "\n  Fate: ")}\n")}\n'
   > fatelog = log -G -T '{node|short}\n{if(obsfate, "  Obsfate: {join(obsfate, "; ")}\n\n")}'
-  > fatelogjson = log -G -T '{node|short} {obsfatedata|json}\n'
+  > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
   > EOF
 
 Test templates on amended commit
@@ -36,24 +36,30 @@
   $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
   $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
   $ hg log --hidden -G
-  @  changeset:   3:d004c8f274b9
+  @  changeset:   4:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A2
   |
-  | x  changeset:   2:a468dc9b3633
+  | x  changeset:   3:a468dc9b3633
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 3:d004c8f274b9 by test2
+  |    obsolete:    reworded as d004c8f274b9 by test2
   |    summary:     A1
   |
+  | x  changeset:   2:f137d23bb3e1
+  | |  user:        test
+  | |  date:        Thu Jan 01 00:00:00 1970 +0000
+  | |  obsolete:    pruned
+  | |  summary:     temporary amend commit for 471f378eab4c
+  | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using amend as 2:a468dc9b3633
+  |    obsolete:    rewritten as a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -70,9 +76,9 @@
 
 Precursors template should show current revision as it is the working copy
   $ hg olog tip
-  o  d004c8f274b9 (3) A2
+  o  d004c8f274b9 (4) A2
   |
-  x  a468dc9b3633 (2) A1
+  x  a468dc9b3633 (3) A1
   |    rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
   |
   @  471f378eab4c (1) A0
@@ -83,15 +89,15 @@
   |    Precursors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 3:d004c8f274b9
-  |      semi-colon: 3:d004c8f274b9
-  |      Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
+  |/     Successors: 4:d004c8f274b9
+  |      semi-colon: 4:d004c8f274b9
+  |      Fate: rewritten as d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
 
   $ hg log -G
-  o  changeset:   3:d004c8f274b9
+  o  changeset:   4:d004c8f274b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
@@ -101,7 +107,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
+  |    obsolete:    rewritten as d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -114,7 +120,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten using amend as 3:d004c8f274b9
+  |/     Obsfate: rewritten as d004c8f274b9
   |
   o  ea207398892e
   
@@ -123,7 +129,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
+  |/     Obsfate: rewritten as d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
@@ -131,7 +137,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -162,12 +168,12 @@
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  d004c8f274b9
-  |    Precursors: 2:a468dc9b3633
-  |    semi-colon: 2:a468dc9b3633
+  |    Precursors: 3:a468dc9b3633
+  |    semi-colon: 3:a468dc9b3633
   | @  a468dc9b3633
-  |/     Successors: 3:d004c8f274b9
-  |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
+  |/     Successors: 4:d004c8f274b9
+  |      semi-colon: 4:d004c8f274b9
+  |      Fate: reworded as d004c8f274b9 by test2
   |
   o  ea207398892e
   
@@ -175,27 +181,22 @@
 --hidden  
   $ hg tlog --hidden
   o  d004c8f274b9
-  |    Precursors: 2:a468dc9b3633
-  |    semi-colon: 2:a468dc9b3633
+  |    Precursors: 3:a468dc9b3633
+  |    semi-colon: 3:a468dc9b3633
   | @  a468dc9b3633
   |/     Precursors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
-  |      Successors: 3:d004c8f274b9
-  |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
+  |      Successors: 4:d004c8f274b9
+  |      semi-colon: 4:d004c8f274b9
+  |      Fate: reworded as d004c8f274b9 by test2
   |
+  | x  f137d23bb3e1
+  | |    Fate: pruned
+  | |
   | x  471f378eab4c
-  |/     Successors: 2:a468dc9b3633
-  |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten using amend as 2:a468dc9b3633
-  |
-  o  ea207398892e
-  
-  $ hg fatelog -v
-  o  d004c8f274b9
-  |
-  | @  a468dc9b3633
-  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Successors: 3:a468dc9b3633
+  |      semi-colon: 3:a468dc9b3633
+  |      Fate: rewritten as a468dc9b3633
   |
   o  ea207398892e
   
@@ -208,19 +209,22 @@
   
   $ hg tlog --hidden
   @  d004c8f274b9
-  |    Precursors: 2:a468dc9b3633
-  |    semi-colon: 2:a468dc9b3633
+  |    Precursors: 3:a468dc9b3633
+  |    semi-colon: 3:a468dc9b3633
   | x  a468dc9b3633
   |/     Precursors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
-  |      Successors: 3:d004c8f274b9
-  |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
+  |      Successors: 4:d004c8f274b9
+  |      semi-colon: 4:d004c8f274b9
+  |      Fate: reworded as d004c8f274b9 by test2
   |
+  | x  f137d23bb3e1
+  | |    Fate: pruned
+  | |
   | x  471f378eab4c
-  |/     Successors: 2:a468dc9b3633
-  |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten using amend as 2:a468dc9b3633
+  |/     Successors: 3:a468dc9b3633
+  |      semi-colon: 3:a468dc9b3633
+  |      Fate: rewritten as a468dc9b3633
   |
   o  ea207398892e
   
@@ -234,10 +238,13 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
+  | x  f137d23bb3e1
+  | |    Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
+  | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -245,9 +252,11 @@
   $ hg fatelogjson --hidden
   @  d004c8f274b9 []
   |
-  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
+  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
   |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
+  | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
+  | |
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
   |/
   o  ea207398892e []
   
@@ -326,7 +335,7 @@
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 2:337fec4d2edc, 3:f257fde29c7a
+  |    obsolete:    split as 337fec4d2edc, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -354,7 +363,7 @@
   | @  471597cad322
   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
-  |      Fate: split as 2:337fec4d2edc, 3:f257fde29c7a
+  |      Fate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
   
@@ -364,7 +373,7 @@
   o  337fec4d2edc
   |
   | @  471597cad322
-  |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
+  |/     Obsfate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
   
@@ -393,7 +402,7 @@
   | x  471597cad322
   |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
   |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
-  |      Fate: split as 2:337fec4d2edc, 3:f257fde29c7a
+  |      Fate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
   
@@ -403,7 +412,7 @@
   o  337fec4d2edc
   |
   | x  471597cad322
-  |/     Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a
+  |/     Obsfate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
   
@@ -460,13 +469,13 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as 3:eb5a0daa2192
+  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 3:eb5a0daa2192
+  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -490,7 +499,7 @@
   | @  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten as 3:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -498,7 +507,7 @@
   o  eb5a0daa2192
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -516,12 +525,12 @@
   | @  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: rewritten as 3:eb5a0daa2192
+  | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten as 3:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -529,10 +538,10 @@
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
-  | |    Obsfate: rewritten as 3:eb5a0daa2192
+  | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 3:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -556,12 +565,12 @@
   | x  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: rewritten as 3:eb5a0daa2192
+  | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: rewritten as 3:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -569,10 +578,10 @@
   @  eb5a0daa2192
   |
   | x  0dec01379d3b
-  | |    Obsfate: rewritten as 3:eb5a0daa2192
+  | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 3:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -609,7 +618,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -622,28 +631,28 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
+  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: content-divergent
+  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
-  |    obsolete:    reworded using amend as 3:65b757b745b9
+  |    obsolete:    reworded as fdf9bde5129a
+  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -672,8 +681,8 @@
   | @  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
   |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
-  |      Fate: reworded using amend as 2:fdf9bde5129a
-  |      Fate: reworded using amend as 4:019fadeab383
+  |      Fate: reworded as fdf9bde5129a
+  |      Fate: reworded as 019fadeab383
   |
   o  ea207398892e
   
@@ -683,7 +692,7 @@
   | o  fdf9bde5129a
   |/
   | @  471f378eab4c
-  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
+  |/     Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
   |
   o  ea207398892e
   
@@ -717,7 +726,7 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 4:019fadeab383
   |      semi-colon: 4:019fadeab383
-  |      Fate: reworded using amend as 4:019fadeab383
+  |      Fate: reworded as 019fadeab383
   |
   | @  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
@@ -725,8 +734,8 @@
   | x  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
   |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
-  |      Fate: reworded using amend as 2:fdf9bde5129a
-  |      Fate: reworded using amend as 3:65b757b745b9
+  |      Fate: reworded as fdf9bde5129a
+  |      Fate: reworded as 65b757b745b9
   |
   o  ea207398892e
   
@@ -734,12 +743,12 @@
   o  019fadeab383
   |
   | x  65b757b745b9
-  |/     Obsfate: reworded using amend as 4:019fadeab383
+  |/     Obsfate: reworded as 019fadeab383
   |
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
-  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
+  |/     Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
   |
   o  ea207398892e
   
@@ -747,11 +756,11 @@
   $ hg fatelogjson --hidden
   o  019fadeab383 []
   |
-  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
+  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
   |/
   | @  fdf9bde5129a []
   |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
   |/
   o  ea207398892e []
   
@@ -779,7 +788,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 3:b7ea6d14e664
+  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -807,19 +816,19 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as 4:eb5a0daa2192
+  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
+  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 4:eb5a0daa2192
+  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -841,7 +850,7 @@
   | @  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten as 4:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -849,7 +858,7 @@
   o  eb5a0daa2192
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 4:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -864,12 +873,12 @@
   | @  0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten using amend as 4:eb5a0daa2192
+  | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten as 4:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -877,10 +886,10 @@
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
-  | |    Obsfate: rewritten using amend as 4:eb5a0daa2192
+  | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 4:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -896,12 +905,12 @@
   | @  b7ea6d14e664
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten as 4:eb5a0daa2192
+  | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten as 4:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -909,10 +918,10 @@
   o  eb5a0daa2192
   |
   | @  b7ea6d14e664
-  | |    Obsfate: rewritten as 4:eb5a0daa2192
+  | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 4:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -933,17 +942,17 @@
   | |    semi-colon: 2:0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten as 4:eb5a0daa2192
+  | |    Fate: rewritten as eb5a0daa2192
   | |
   | | x  0dec01379d3b
   | |/     Successors: 3:b7ea6d14e664
   | |      semi-colon: 3:b7ea6d14e664
-  | |      Fate: reworded using amend as 3:b7ea6d14e664
+  | |      Fate: reworded as b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: rewritten as 4:eb5a0daa2192
+  |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -951,13 +960,13 @@
   @  eb5a0daa2192
   |
   | x  b7ea6d14e664
-  | |    Obsfate: rewritten as 4:eb5a0daa2192
+  | |    Obsfate: rewritten as eb5a0daa2192
   | |
   | | x  0dec01379d3b
-  | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
+  | |/     Obsfate: reworded as b7ea6d14e664
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 4:eb5a0daa2192
+  |/     Obsfate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
   
@@ -966,7 +975,7 @@
   |
   | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   | |
-  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
+  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
   | |/
   | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
   |/
@@ -1014,13 +1023,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 3:7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1038,7 +1047,6 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 7a230b46bf61
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -1053,7 +1061,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 2:7a230b46bf61
+  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1071,7 +1079,7 @@
   | @  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded using amend as 2:7a230b46bf61
+  |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
   
@@ -1079,7 +1087,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1102,7 +1110,7 @@
   | x  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded using amend as 2:7a230b46bf61
+  |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
   
@@ -1110,7 +1118,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1118,7 +1126,7 @@
   $ hg fatelogjson --hidden
   @  7a230b46bf61 []
   |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
   |/
   o  ea207398892e []
   

--- a/tests/test-evolve-topic.t
+++ b/tests/test-evolve-topic.t
@@ -87,16 +87,16 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ddd >> ddd
   $ hg amend
-  6 new orphan changesets
+  6 new unstable changesets
   $ hg up 'desc(fff)'
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo fff >> fff
   $ hg amend
 
   $ hg log -G
-  @  11 - {foo} e104f49bab28 add fff (draft)
+  @  13 - {foo} e104f49bab28 add fff (draft)
   |
-  | o  10 - {foo} d9cacd156ffc add ddd (draft)
+  | o  11 - {foo} d9cacd156ffc add ddd (draft)
   | |
   | | o  9 - {bar} 1d964213b023 add jjj (draft)
   | | |
@@ -123,16 +123,16 @@
 
   $ hg evolve --all
   move:[4] add eee
-  atop:[10] add ddd
-  move:[11] add fff
-  atop:[12] add eee
+  atop:[11] add ddd
+  move:[13] add fff
+  atop:[14] add eee
   working directory is now at 070c5573d8f9
   $ hg log -G
-  @  13 - {foo} 070c5573d8f9 add fff (draft)
+  @  15 - {foo} 070c5573d8f9 add fff (draft)
   |
-  o  12 - {foo} 42b49017ff90 add eee (draft)
+  o  14 - {foo} 42b49017ff90 add eee (draft)
   |
-  o  10 - {foo} d9cacd156ffc add ddd (draft)
+  o  11 - {foo} d9cacd156ffc add ddd (draft)
   |
   | o  9 - {bar} 1d964213b023 add jjj (draft)
   | |
@@ -160,28 +160,28 @@
 
   $ hg evolve --rev 'topic(bar)'
   move:[6] add ggg
-  atop:[13] add fff
+  atop:[15] add fff
   move:[7] add hhh
-  atop:[14] add ggg
+  atop:[16] add ggg
   move:[8] add iii
-  atop:[15] add hhh
+  atop:[17] add hhh
   move:[9] add jjj
-  atop:[16] add iii
+  atop:[18] add iii
   working directory is now at 9bf430c106b7
   $ hg log -G
-  @  17 - {bar} 9bf430c106b7 add jjj (draft)
+  @  19 - {bar} 9bf430c106b7 add jjj (draft)
   |
-  o  16 - {bar} d2dc89c57700 add iii (draft)
+  o  18 - {bar} d2dc89c57700 add iii (draft)
   |
-  o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  o  17 - {bar} 20bc4d02aa62 add hhh (draft)
   |
-  o  14 - {bar} 16d6f664b17c add ggg (draft)
+  o  16 - {bar} 16d6f664b17c add ggg (draft)
   |
-  o  13 - {foo} 070c5573d8f9 add fff (draft)
+  o  15 - {foo} 070c5573d8f9 add fff (draft)
   |
-  o  12 - {foo} 42b49017ff90 add eee (draft)
+  o  14 - {foo} 42b49017ff90 add eee (draft)
   |
-  o  10 - {foo} d9cacd156ffc add ddd (draft)
+  o  11 - {foo} d9cacd156ffc add ddd (draft)
   |
   o  2 - {foo} cced9bac76e3 add ccc (draft)
   |
@@ -200,10 +200,10 @@
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [12] add eee
+  [14] add eee
   $ hg next
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  [13] add fff
+  [15] add fff
   $ hg next
   no children on topic "foo"
   do you want --no-topic
@@ -211,11 +211,11 @@
   $ hg next --no-topic
   switching to topic bar
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  [14] add ggg
+  [16] add ggg
   $ hg prev
   preserving the current topic 'bar'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [13] add fff
+  [15] add fff
   $ hg prev
   no parent in topic "bar"
   (do you want --no-topic)
@@ -223,4 +223,4 @@
   $ hg prev --no-topic
   switching to topic foo
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [12] add eee
+  [14] add eee

--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -327,7 +327,7 @@
 changeset plus the updating changeset are hidden from view by default::
 
   $ hg log
-  3	feature-B: another feature (child of 568a468b60fc) - test
+  4	feature-B: another feature (child of 568a468b60fc) - test
   1	feature-A: a nifty feature - test
   0	: base - test
 
@@ -344,18 +344,22 @@
 (amend of on ancestors)
 
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg log
-  4	feature-A: a nifty feature - test
-  3	feature-B: another feature (child of 568a468b60fc) - test
+  6	feature-A: a nifty feature - test
+  4	feature-B: another feature (child of 568a468b60fc) - test
   1	: a nifty feature - test
   0	: base - test
   $ hg up -q 0
   $ glog --hidden
-  o  4:ba0ec09b1bab@default(draft) a nifty feature
+  o  6:ba0ec09b1bab@default(draft) a nifty feature
   |
-  | o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+  | x  5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
   | |
+  | | o  4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+  | |/
+  | | x  3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a
+  | | |
   | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
   | |/
   | x  1:568a468b60fc@default(draft) a nifty feature
@@ -363,16 +367,18 @@
   @  0:e55e0562ee93@default(public) base
   
   $ hg debugobsolete
-  73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+  c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob)
+  568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+  c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob)
   $ hg evolve
-  move:[3] another feature (child of 568a468b60fc)
-  atop:[4] a nifty feature
+  move:[4] another feature (child of 568a468b60fc)
+  atop:[6] a nifty feature
   merging main-file-1
   working directory is now at 99833d22b0c6
   $ hg log
-  5	feature-B: another feature (child of ba0ec09b1bab) - test
-  4	feature-A: a nifty feature - test
+  7	feature-B: another feature (child of ba0ec09b1bab) - test
+  6	feature-A: a nifty feature - test
   0	: base - test
 
 Test commit -o options
@@ -383,43 +389,43 @@
   adding file-from-B
   reverting main-file-1
   $ sed -i'' -e s/Zwei/deux/ main-file-1
-  $ hg commit -m 'another feature that rox' -o 5
+  $ hg commit -m 'another feature that rox' -o 7
   created new head
   $ hg log
-  6	feature-B: another feature that rox - test
-  4	feature-A: a nifty feature - test
+  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 bumped warning
 
   $ hg phase --hidden --public 99833d22b0c6
-  1 new phase-divergent changesets
+  1 new bumped changesets
 
 all solving bumped troubled
 
-  $ glog
-  @  6:47d52a103155@default(draft) another feature that rox
+  $ hg log -G
+  @  8	feature-B: another feature that rox - test
   |
-  | o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  | o  7	: another feature (child of ba0ec09b1bab) - test
   |/
-  o  4:ba0ec09b1bab@default(public) a nifty feature
+  o  6	feature-A: a nifty feature - test
   |
-  o  0:e55e0562ee93@default(public) base
+  o  0	: base - test
   
   $ hg evolve --any --traceback --phasedivergent
-  recreate:[6] another feature that rox
-  atop:[5] another feature (child of ba0ec09b1bab)
+  recreate:[8] another feature that rox
+  atop:[7] another feature (child of ba0ec09b1bab)
   computing new diff
   committed as 6707c5e1c49d
   working directory is now at 6707c5e1c49d
-  $ glog
-  @  7:6707c5e1c49d@default(draft) bumped update to 99833d22b0c6:
+  $ hg log -G
+  @  9	feature-B: bumped update to 99833d22b0c6: - test
   |
-  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  o  7	: another feature (child of ba0ec09b1bab) - test
   |
-  o  4:ba0ec09b1bab@default(public) a nifty feature
+  o  6	feature-A: a nifty feature - test
   |
-  o  0:e55e0562ee93@default(public) base
+  o  0	: base - test
   
   $ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155
   $ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d
@@ -440,22 +446,22 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ sed -i'' -e s/Un/Én/ main-file-1
   $ hg commit --amend -m 'dansk!'
-  2 new orphan changesets
+  2 new unstable changesets
 
 (ninja test for the {trouble} template:
 
   $ hg log -G --template '{rev} {troubles}\n'
-  @  10
+  @  13
   |
-  | o  9 orphan
+  | o  11 orphan
   | |
-  | o  8 orphan
+  | o  10 orphan
   | |
-  | x  7
+  | x  9
   |/
-  o  5
+  o  7
   |
-  o  4
+  o  6
   |
   o  0
   
@@ -464,23 +470,23 @@
 (/ninja)
 
   $ hg evolve --all --traceback
-  move:[8] dansk 2!
-  atop:[10] dansk!
+  move:[10] dansk 2!
+  atop:[13] dansk!
   merging main-file-1
-  move:[9] dansk 3!
-  atop:[11] dansk 2!
+  move:[11] dansk 3!
+  atop:[14] dansk 2!
   merging main-file-1
   working directory is now at 68557e4f0048
   $ hg log -G
-  @  12	: dansk 3! - test
+  @  15	: dansk 3! - test
   |
-  o  11	: dansk 2! - test
+  o  14	: dansk 2! - test
   |
-  o  10	feature-B: dansk! - test
+  o  13	feature-B: dansk! - test
   |
-  o  5	: another feature (child of ba0ec09b1bab) - test
+  o  7	: another feature (child of ba0ec09b1bab) - test
   |
-  o  4	feature-A: a nifty feature - test
+  o  6	feature-A: a nifty feature - test
   |
   o  0	: base - test
   
@@ -508,7 +514,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 702e4d0a6d86
   $ cd alpha
 
   $ cat << EOF > A
@@ -541,13 +546,13 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  3 files, 3 changesets, 3 total revisions
+  3 files, 4 changesets, 4 total revisions
   $ hg --config extensions.hgext.mq= strip 'extinct()'
   abort: empty revision set
   [255]
 (do some garbare collection)
   $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'  --config devel.strip-obsmarkers=no
-  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob)
+  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob)
   $ hg verify
   checking changesets
   checking manifests
@@ -566,8 +571,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new obsolescence markers
-  new changesets c6dda801837c
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -827,7 +831,7 @@
   $ hg ci -m c
   $ hg prune .^
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg stab --any
   move:[15] c
   atop:[13] a
@@ -844,13 +848,13 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
-  @  13:98cb758db56d@default(draft) Folding with custom commit message
+  @  16:98cb758db56d@default(draft) Folding with custom commit message
   |
-  o  10:0a2f9b959bb4@default(draft) dansk!
+  o  13:0a2f9b959bb4@default(draft) dansk!
   |
-  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  o  7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   |
-  o  4:ba0ec09b1bab@default(public) a nifty feature
+  o  6:ba0ec09b1bab@default(public) a nifty feature
   |
   o  0:e55e0562ee93@default(public) base
   
@@ -863,10 +867,10 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qlog
-  14 - a00182c58888 A longer
+  17 - a00182c58888 A longer
                     commit message (draft)
-  5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
-  4 - ba0ec09b1bab a nifty feature (public)
+  7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
+  6 - ba0ec09b1bab a nifty feature (public)
   0 - e55e0562ee93 base (public)
 
   $ cd ..
@@ -904,17 +908,17 @@
   marked working directory as branch mybranch
   (branches are permanent and global, did you want a bookmark?)
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg evolve
   move:[3] a3
-  atop:[4] a2
+  atop:[5] a2
   working directory is now at 7c5649f73d11
 
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  @  5 [mybranch] a3
+  @  6 [mybranch] a3
   |
-  o  4 [mybranch] a2
+  o  5 [mybranch] a2
   |
   o  1 [default] a1
   |
@@ -926,21 +930,21 @@
   $ hg up 'desc(a1)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg amend -m 'a1_'
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve
-  move:[4] a2
-  atop:[6] a1_
+  move:[5] a2
+  atop:[7] a1_
   working directory is now at eb07e22a0e63
   $ hg evolve
-  move:[5] a3
-  atop:[7] a2
+  move:[6] a3
+  atop:[8] a2
   working directory is now at 777c26ca5e78
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  @  8 [mybranch] a3
+  @  9 [mybranch] a3
   |
-  o  7 [mybranch] a2
+  o  8 [mybranch] a2
   |
-  o  6 [default] a1_
+  o  7 [default] a1_
   |
   o  0 [default] a0
   
@@ -950,18 +954,18 @@
   $ hg up -r "desc('a1_')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci --amend -m 'a1__'
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg up -r "desc('a2')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  o  9 [default] a1__
+  o  10 [default] a1__
   |
-  | o  8 [mybranch] a3
+  | o  9 [mybranch] a3
   | |
-  | @  7 [mybranch] a2
+  | @  8 [mybranch] a2
   | |
-  | x  6 [default] a1_
+  | x  7 [default] a1_
   |/
   o  0 [default] a0
   
@@ -980,22 +984,22 @@
   .hg/bookmarks
   .hg/bookmarks.* (glob)
   $ hg evolve
-  move:[7] a2
-  atop:[9] a1__
+  move:[8] a2
+  atop:[10] a1__
   (leaving bookmark testbookmark)
   working directory is now at d952e93add6f
   $ ls .hg/bookmarks*
   .hg/bookmarks
   $ glog
-  @  10:d952e93add6f@mybranch(draft) a2
+  @  11:d952e93add6f@mybranch(draft) a2
   |
-  o  9:9f8b83c2e7f3@default(draft) a1__
+  o  10:9f8b83c2e7f3@default(draft) a1__
   |
-  | o  8:777c26ca5e78@mybranch(draft) a3
+  | o  9:777c26ca5e78@mybranch(draft) a3
   | |
-  | x  7:eb07e22a0e63@mybranch(draft) a2
+  | x  8:eb07e22a0e63@mybranch(draft) a2
   | |
-  | x  6:faafc6cea0ba@default(draft) a1_
+  | x  7:faafc6cea0ba@default(draft) a1_
   |/
   o  0:07c1c36d9ef0@default(draft) a0
   
@@ -1007,35 +1011,35 @@
   $ hg revert -r d952e93add6f --all
   reverting a
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
-  o  10 [mybranch] a2
+  o  11 [mybranch] a2
   |
-  @  9 [default] a1__
+  @  10 [default] a1__
   |
-  | o  8 [mybranch] a3
+  | o  9 [mybranch] a3
   | |
-  | x  7 [mybranch] a2
+  | x  8 [mybranch] a2
   | |
-  | x  6 [default] a1_
+  | x  7 [default] a1_
   |/
   o  0 [default] a0
   
   $ echo "hello world" > newfile
   $ hg add newfile
-  $ hg commit -m "add new file bumped" -o 10
+  $ hg commit -m "add new file bumped" -o 11
   $ hg phase --public --hidden d952e93add6f
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg log -G
-  @  11	: add new file bumped - test
+  @  12	: add new file bumped - test
   |
-  | o  10	: a2 - test
+  | o  11	: a2 - test
   |/
-  o  9	testbookmark: a1__ - test
+  o  10	testbookmark: a1__ - test
   |
-  | o  8	: a3 - test
+  | o  9	: a3 - test
   | |
-  | x  7	: a2 - test
+  | x  8	: a2 - test
   | |
-  | x  6	: a1_ - test
+  | x  7	: a1_ - test
   |/
   o  0	: a0 - test
   
@@ -1044,42 +1048,30 @@
 normally the unstable changeset would be solve first
 
   $ hg log -G
-  @  11	: add new file bumped - test
+  @  12	: add new file bumped - test
   |
-  | o  10	: a2 - test
+  | o  11	: a2 - test
   |/
-  o  9	testbookmark: a1__ - test
+  o  10	testbookmark: a1__ - test
   |
-  | o  8	: a3 - test
+  | o  9	: a3 - test
   | |
-  | x  7	: a2 - test
+  | x  8	: a2 - test
   | |
-  | x  6	: a1_ - test
+  | x  7	: a1_ - test
   |/
   o  0	: a0 - test
   
   $ hg evolve -r "desc('add new file bumped')" --phasedivergent
-  recreate:[11] add new file bumped
-  atop:[10] a2
+  recreate:[12] add new file bumped
+  atop:[11] a2
   computing new diff
   committed as f15d32934071
   working directory is now at f15d32934071
   $ hg evolve --any
-  move:[8] a3
-  atop:[12] bumped update to d952e93add6f:
+  move:[9] a3
+  atop:[13] bumped update to d952e93add6f:
   working directory is now at cce26b684bfe
-  $ glog
-  @  13:cce26b684bfe@default(draft) a3
-  |
-  o  12:f15d32934071@default(draft) bumped update to d952e93add6f:
-  |
-  o  10:d952e93add6f@mybranch(public) a2
-  |
-  o  9:9f8b83c2e7f3@default(public) a1__
-  |
-  o  0:07c1c36d9ef0@default(public) a0
-  
-
 Check that we can resolve troubles in a revset with more than one commit
   $ hg up cce26b684bfe -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1092,38 +1084,38 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ printf "newline\nnewline\n" >> a
   $ hg log -G
-  o  15	: add gh - test
+  o  16	: add gh - test
   |
-  | o  14	: add gg - test
+  | o  15	: add gg - test
   |/
-  @  13	: a3 - test
+  @  14	: a3 - test
   |
-  o  12	: bumped update to d952e93add6f: - test
+  o  13	: bumped update to d952e93add6f: - test
   |
-  o  10	: a2 - test
+  o  11	: a2 - test
   |
-  o  9	testbookmark: a1__ - test
+  o  10	testbookmark: a1__ - test
   |
   o  0	: a0 - test
   
   $ hg amend
-  2 new orphan changesets
-  $ glog
-  @  16:edc3c9de504e@default(draft) a3
+  2 new unstable changesets
+  $ hg log -G
+  @  18	: a3 - test
   |
-  | o  15:beb41503aa3e@default(draft) add gh
+  | o  16	: add gh - test
   | |
-  | | o  14:27247fcb2df6@default(draft) add gg
+  | | o  15	: add gg - test
   | |/
-  | x  13:cce26b684bfe@default(draft) a3
+  | x  14	: a3 - test
   |/
-  o  12:f15d32934071@default(draft) bumped update to d952e93add6f:
+  o  13	: bumped update to d952e93add6f: - test
   |
-  o  10:d952e93add6f@mybranch(public) a2
+  o  11	: a2 - test
   |
-  o  9:9f8b83c2e7f3@default(public) a1__
+  o  10	testbookmark: a1__ - test
   |
-  o  0:07c1c36d9ef0@default(public) a0
+  o  0	: a0 - test
   
 
 Evolving an empty revset should do nothing
@@ -1136,25 +1128,25 @@
   (do you want to use --orphan)
   [2]
   $ hg evolve --rev "cce26b684bfe::" --orphan
-  move:[14] add gg
-  atop:[16] a3
-  move:[15] add gh
-  atop:[16] a3
+  move:[15] add gg
+  atop:[18] a3
+  move:[16] add gh
+  atop:[18] a3
   working directory is now at e02107f98737
-  $ glog
-  @  18:e02107f98737@default(draft) add gh
+  $ hg log -G
+  @  20	: add gh - test
   |
-  | o  17:24e63b319adf@default(draft) add gg
+  | o  19	: add gg - test
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18	: a3 - test
   |
-  o  12:f15d32934071@default(draft) bumped update to d952e93add6f:
+  o  13	: bumped update to d952e93add6f: - test
   |
-  o  10:d952e93add6f@mybranch(public) a2
+  o  11	: a2 - test
   |
-  o  9:9f8b83c2e7f3@default(public) a1__
+  o  10	testbookmark: a1__ - test
   |
-  o  0:07c1c36d9ef0@default(public) a0
+  o  0	: a0 - test
   
 Enabling commands selectively, no command enabled, next and fold and unknown
   $ cat >> $HGRCPATH <<EOF
@@ -1268,21 +1260,21 @@
   $ echo "hello" > j4
   $ hg add j4
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ glog -r "edc3c9de504e::"
-  @  22:8dc373be86d9@default(draft) add j1
+  @  25:8dc373be86d9@default(draft) add j1
   |
-  | o  21:d7eadcf6eccd@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:2223ea564144@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  19:48490698b269@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:24e63b319adf@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1310,19 +1302,19 @@
   new changeset is empty
   (use 'hg prune .' to remove it)
   $ glog -r "edc3c9de504e::"
-  @  23:044804d0c10d@default(draft) add j1
+  @  26:044804d0c10d@default(draft) add j1
   |
-  | o  21:d7eadcf6eccd@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:2223ea564144@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  19:48490698b269@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:24e63b319adf@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1336,26 +1328,26 @@
   (2 other orphan in the repository, do you want --any or --rev)
   [2]
   $ hg evolve --all --any
-  move:[20] add j2
-  atop:[23] add j1
-  move:[21] add j3
-  atop:[24] add j2
+  move:[22] add j2
+  atop:[26] add j1
+  move:[23] add j3
+  atop:[27] add j2
   working directory is now at c9a20e2d74aa
   $ glog -r "edc3c9de504e::"
-  @  25:c9a20e2d74aa@default(draft) add j3
+  @  28:c9a20e2d74aa@default(draft) add j3
   |
-  o  24:b0e3066231e2@default(draft) add j2
+  o  27:b0e3066231e2@default(draft) add j2
   |
-  o  23:044804d0c10d@default(draft) add j1
+  o  26:044804d0c10d@default(draft) add j1
   |
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:24e63b319adf@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
-  $ hg up 24e63b319adf
+  $ hg up 19
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit c5_
   created new head
@@ -1370,13 +1362,13 @@
   $ hg prune '044804d0c10d::'
   3 changesets pruned
   $ glog -r "edc3c9de504e::"
-  @  26:2251801b6c91@default(draft) add c5_
+  @  29:2251801b6c91@default(draft) add c5_
   |
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:24e63b319adf@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1389,15 +1381,15 @@
   $ mkcommit unstableifparentisfolded
   created new head
   $ glog -r "edc3c9de504e::"
-  @  27:68330ac625b8@default(draft) add unstableifparentisfolded
+  @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |
-  | o  26:2251801b6c91@default(draft) add c5_
+  | o  29:2251801b6c91@default(draft) add c5_
   | |
-  +---o  18:e02107f98737@default(draft) add gh
+  +---o  20:e02107f98737@default(draft) add gh
   | |
-  | o  17:24e63b319adf@default(draft) add gg
+  | o  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1413,13 +1405,13 @@
   > EOF
 
   $ glog -r "edc3c9de504e::"
-  o  28:580886d07058@default(draft) add gg
+  o  31:580886d07058@default(draft) add gg
   |
-  | @  27:68330ac625b8@default(draft) add unstableifparentisfolded
+  | @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1440,28 +1432,28 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog -r "edc3c9de504e::"
-  @  32:7a555adf2b4a@default(draft) _pp
+  @  35:7a555adf2b4a@default(draft) _pp
   |
-  o  31:2be4d2d5bf34@default(draft) _oo
+  o  34:2be4d2d5bf34@default(draft) _oo
   |
-  | o  30:53f0c003e03e@default(draft) add uu
+  | o  33:53f0c003e03e@default(draft) add uu
   | |
-  | x  29:1bf2152f4f82@default(draft) oo+pp
+  | x  32:1bf2152f4f82@default(draft) oo+pp
   |/
-  | o  28:580886d07058@default(draft) add gg
+  | o  31:580886d07058@default(draft) add gg
   | |
-  o |  27:68330ac625b8@default(draft) add unstableifparentisfolded
+  o |  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  18:e02107f98737@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  16:edc3c9de504e@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
   $ hg evolve --rev "edc3c9de504e::"
-  move:[30] add uu
-  atop:[32] _pp
+  move:[33] add uu
+  atop:[35] _pp
   working directory is now at 43c3f5ef149f
 
 
@@ -1471,7 +1463,7 @@
   $ echo "will be amended" > newfile
   $ hg commit -m "will be amended"
   $ hg parents
-  34	: will be amended - test
+  37	: will be amended - test
 
   $ echo "will be evolved safely" >> a
   $ hg commit -m "will be evolved safely"
@@ -1481,39 +1473,16 @@
   $ hg add newlyadded
   $ hg commit -m "will cause conflict at evolve"
 
-  $ glog -r "edc3c9de504e::"
-  @  36:02e943732647@default(draft) will cause conflict at evolve
-  |
-  o  35:f8e30e9317aa@default(draft) will be evolved safely
-  |
-  o  34:36030b147271@default(draft) will be amended
-  |
-  o  33:43c3f5ef149f@default(draft) add uu
-  |
-  o  32:7a555adf2b4a@default(draft) _pp
-  |
-  o  31:2be4d2d5bf34@default(draft) _oo
-  |
-  | o  28:580886d07058@default(draft) add gg
-  | |
-  o |  27:68330ac625b8@default(draft) add unstableifparentisfolded
-  |/
-  | o  18:e02107f98737@default(draft) add gh
-  |/
-  o  16:edc3c9de504e@default(draft) a3
-  |
-  ~
-
   $ hg update -q 36030b147271
   $ echo "amended" > newfile
   $ hg amend -m "amended"
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg evolve --rev "36030b147271::"
-  move:[35] will be evolved safely
-  atop:[37] amended
-  move:[36] will cause conflict at evolve
-  atop:[38] will be evolved safely
+  move:[38] will be evolved safely
+  atop:[41] amended
+  move:[39] will cause conflict at evolve
+  atop:[42] will be evolved safely
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   evolve failed!
@@ -1522,17 +1491,19 @@
   [255]
 
   $ glog -r "43c3f5ef149f::" --hidden
-  @  38:c904da5245b0@default(draft) will be evolved safely
+  @  42:c904da5245b0@default(draft) will be evolved safely
   |
-  o  37:34ae045ec400@default(draft) amended
+  o  41:34ae045ec400@default(draft) amended
   |
-  | o  36:02e943732647@default(draft) will cause conflict at evolve
+  | x  40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271
   | |
-  | x  35:f8e30e9317aa@default(draft) will be evolved safely
-  | |
-  | x  34:36030b147271@default(draft) will be amended
+  | | o  39:02e943732647@default(draft) will cause conflict at evolve
+  | | |
+  | | x  38:f8e30e9317aa@default(draft) will be evolved safely
+  | |/
+  | x  37:36030b147271@default(draft) will be amended
   |/
-  o  33:43c3f5ef149f@default(draft) add uu
+  o  36:43c3f5ef149f@default(draft) add uu
   |
   ~
 

--- a/tests/test-exchange-obsmarkers-case-A1.t
+++ b/tests/test-exchange-obsmarkers-case-A1.t
@@ -113,7 +113,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -155,7 +154,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -269,7 +267,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets f5bc6836db60:f6fbb35d8ac9
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -311,7 +308,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets f5bc6836db60:f6fbb35d8ac9
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-A2.t
+++ b/tests/test-exchange-obsmarkers-case-A2.t
@@ -124,7 +124,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-A3.t
+++ b/tests/test-exchange-obsmarkers-case-A3.t
@@ -145,7 +145,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -264,9 +263,8 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets e5ea8f9c7314
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  1 new orphan changesets
+  1 new unstable changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

--- a/tests/test-exchange-obsmarkers-case-A4.t
+++ b/tests/test-exchange-obsmarkers-case-A4.t
@@ -133,7 +133,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets 28b51eb45704:06055a7959d4
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-A5.t
+++ b/tests/test-exchange-obsmarkers-case-A5.t
@@ -141,7 +141,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f6298a8ac3a4
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-B3.t
+++ b/tests/test-exchange-obsmarkers-case-B3.t
@@ -120,7 +120,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets f5bc6836db60
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-B5.t
+++ b/tests/test-exchange-obsmarkers-case-B5.t
@@ -157,7 +157,6 @@
   adding file changes
   added 3 changesets with 3 changes to 3 files
   1 new obsolescence markers
-  new changesets 28b51eb45704:1d0f3cd25300
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-C1.t
+++ b/tests/test-exchange-obsmarkers-case-C1.t
@@ -58,7 +58,7 @@
   $ mkcommit A
   $ mkcommit B
   $ hg prune -qd '0 0' '.~1'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  f6fbb35d8ac9 (draft): B

--- a/tests/test-exchange-obsmarkers-case-C2.t
+++ b/tests/test-exchange-obsmarkers-case-C2.t
@@ -131,7 +131,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -179,7 +178,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-D1.t
+++ b/tests/test-exchange-obsmarkers-case-D1.t
@@ -127,7 +127,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -175,7 +174,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-exchange-obsmarkers-case-D4.t
+++ b/tests/test-exchange-obsmarkers-case-D4.t
@@ -140,7 +140,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main

--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -100,7 +100,7 @@
   $ echo babar > cJ
   $ hg commit --amend
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   o  6:cf5c4f4554ce add cH
   |
@@ -112,7 +112,7 @@
   
   $ hg debugobsinhibit --hidden 18214586bf78
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -128,7 +128,7 @@
 and no divergence
 
   $ hg summary
-  parent: 8:55c73a90e4b4 tip
+  parent: 9:55c73a90e4b4 tip
    add cJ
   branch: default
   commit: (clean)
@@ -146,7 +146,7 @@
   $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
   20 .hg/store/obsinhibit
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -159,8 +159,8 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg phase --public 7
-  1 new phase-divergent changesets
-  $ hg strip 8
+  1 new bumped changesets
+  $ hg strip 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at cf5c4f4554ce
   1 changesets pruned
@@ -179,7 +179,7 @@
   $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
   20 .hg/store/obsinhibit
   $ hg log -G
-  o  8:55c73a90e4b4 add cJ
+  o  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -196,7 +196,7 @@
   $ hg update 2 --hidden
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg log -G
-  o  8:55c73a90e4b4 add cJ
+  o  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -213,10 +213,10 @@
   o  0:54ccbc537fc2 add cA
   
 
-  $ hg update 8
+  $ hg update 9
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -235,7 +235,7 @@
   $ hg strip --hidden 1::
   3 changesets pruned
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -251,7 +251,7 @@
 Bookmark should inhibit all related unstable commits
   $ hg bookmark -r 2 book1  --hidden
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -276,7 +276,7 @@
   bookmark 'book1' deleted
   1 changesets pruned
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -294,7 +294,7 @@
   bookmark 'book2' deleted
   1 changesets pruned
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -397,14 +397,14 @@
   $ mkcommit cK
   created new head
   $ mkcommit cL
-  $ hg update -C 8
+  $ hg update -C 9
   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg log -G
-  o  10:53a94305e133 add cL
+  o  11:53a94305e133 add cL
   |
-  o  9:ad78ff7d621f add cK
+  o  10:ad78ff7d621f add cK
   |
-  | @  8:55c73a90e4b4 add cJ
+  | @  9:55c73a90e4b4 add cJ
   | |
   | | o  7:18214586bf78 add cJ
   | |/
@@ -416,10 +416,10 @@
   |/
   o  0:54ccbc537fc2 add cA
   
-  $ hg strip --hidden 9:
+  $ hg strip --hidden 10:
   2 changesets pruned
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -431,21 +431,21 @@
   |
   o  0:54ccbc537fc2 add cA
   
-  $ hg rebase -s 9 -d 3 
-  abort: hidden revision '9'!
+  $ hg rebase -s 10 -d 3 
+  abort: hidden revision '3'!
   (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff --config experimental.rebaseskipobsolete=0
+  Warning: accessing hidden changesets 2db36d8066ff for write operation
   Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
-  Warning: accessing hidden changesets 2db36d8066ff for write operation
-  rebasing 9:ad78ff7d621f "add cK"
-  rebasing 10:53a94305e133 "add cL" (tip)
+  rebasing 10:ad78ff7d621f "add cK"
+  rebasing 11:53a94305e133 "add cL"
   $ hg log -G
-  o  12:2f7b7704d714 add cL
+  o  13:2f7b7704d714 add cL
   |
-  o  11:fe1634cbe235 add cK
+  o  12:fe1634cbe235 add cK
   |
-  | @  8:55c73a90e4b4 add cJ
+  | @  9:55c73a90e4b4 add cJ
   | |
   | | o  7:18214586bf78 add cJ
   | |/
@@ -476,7 +476,7 @@
   $ hg strip --hidden 1::
   5 changesets pruned
   $ hg log -G
-  @  8:55c73a90e4b4 add cJ
+  @  9:55c73a90e4b4 add cJ
   |
   | o  7:18214586bf78 add cJ
   |/
@@ -494,13 +494,13 @@
   $ mkcommit cM
   $ mkcommit cN
   $ hg log -G
-  @  15:a438c045eb37 add cN
+  @  16:a438c045eb37 add cN
   |
-  o  14:2d66e189f5b5 add cM
+  o  15:2d66e189f5b5 add cM
   |
-  o  13:d66ccb8c5871 add cL
+  o  14:d66ccb8c5871 add cL
   |
-  | o  8:55c73a90e4b4 add cJ
+  | o  9:55c73a90e4b4 add cJ
   | |
   o |  7:18214586bf78 add cJ
   |/
@@ -512,20 +512,20 @@
   |
   o  0:54ccbc537fc2 add cA
   
-  $ hg up 14
+  $ hg up 15
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "mmm" >> cM
   $ hg amend
   $ hg log -G
-  @  16:210589181b14 add cM
+  @  18:210589181b14 add cM
   |
-  | o  15:a438c045eb37 add cN
+  | o  16:a438c045eb37 add cN
   | |
-  | o  14:2d66e189f5b5 add cM
+  | o  15:2d66e189f5b5 add cM
   |/
-  o  13:d66ccb8c5871 add cL
+  o  14:d66ccb8c5871 add cL
   |
-  | o  8:55c73a90e4b4 add cJ
+  | o  9:55c73a90e4b4 add cJ
   | |
   o |  7:18214586bf78 add cJ
   |/
@@ -539,18 +539,18 @@
   
 Check that rebasing a commit twice makes the commit visible again
 
-  $ hg rebase -d 16 -r 15 --keep
-  rebasing 15:a438c045eb37 "add cN"
-  $ hg log -r 13:: -G
-  o  17:104eed5354c7 add cN
+  $ hg rebase -d 18 -r 16 --keep
+  rebasing 16:a438c045eb37 "add cN"
+  $ hg log -r 14:: -G
+  o  19:104eed5354c7 add cN
   |
-  @  16:210589181b14 add cM
+  @  18:210589181b14 add cM
   |
-  | o  15:a438c045eb37 add cN
+  | o  16:a438c045eb37 add cN
   | |
-  | o  14:2d66e189f5b5 add cM
+  | o  15:2d66e189f5b5 add cM
   |/
-  o  13:d66ccb8c5871 add cL
+  o  14:d66ccb8c5871 add cL
   |
   ~
   $ hg strip -r 210589181b14
@@ -561,18 +561,18 @@
 Using a hash prefix solely made of digits should work
   $ hg update 210589181
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg rebase -d 16 -r 15 --keep
-  rebasing 15:a438c045eb37 "add cN"
-  $ hg log -r 13:: -G
-  o  17:104eed5354c7 add cN
+  $ hg rebase -d 18 -r 16 --keep
+  rebasing 16:a438c045eb37 "add cN"
+  $ hg log -r 14:: -G
+  o  19:104eed5354c7 add cN
   |
-  @  16:210589181b14 add cM
+  @  18:210589181b14 add cM
   |
-  | o  15:a438c045eb37 add cN
+  | o  16:a438c045eb37 add cN
   | |
-  | o  14:2d66e189f5b5 add cM
+  | o  15:2d66e189f5b5 add cM
   |/
-  o  13:d66ccb8c5871 add cL
+  o  14:d66ccb8c5871 add cL
   |
   ~
 
@@ -583,25 +583,25 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at d66ccb8c5871
   2 changesets pruned
-  $ hg log -r 13:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
-  o  15:a438c045eb37 add cN
+  $ hg log -r 14:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
+  o  16:a438c045eb37 add cN
   |
-  o  14:2d66e189f5b5 add cM
+  o  15:2d66e189f5b5 add cM
   |
-  @  13:d66ccb8c5871 add cL foo
+  @  14:d66ccb8c5871 add cL foo
   |
   ~
 
 Check that --hidden used with inhibit does not hide every obsolete commit
 We show the log before and after a log -G --hidden, they should be the same
   $ hg log -G
-  o  15:a438c045eb37 add cN
+  o  16:a438c045eb37 add cN
   |
-  o  14:2d66e189f5b5 add cM
+  o  15:2d66e189f5b5 add cM
   |
-  @  13:d66ccb8c5871 add cL
+  @  14:d66ccb8c5871 add cL
   |
-  | o  8:55c73a90e4b4 add cJ
+  | o  9:55c73a90e4b4 add cJ
   | |
   o |  7:18214586bf78 add cJ
   |/
@@ -614,25 +614,29 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg log -G --hidden
-  x  17:104eed5354c7 add cN
+  x  19:104eed5354c7 add cN
   |
-  x  16:210589181b14 add cM
+  x  18:210589181b14 add cM
   |
-  | o  15:a438c045eb37 add cN
+  | x  17:b3c3274523f9 temporary amend commit for 2d66e189f5b5
   | |
-  | o  14:2d66e189f5b5 add cM
+  | | o  16:a438c045eb37 add cN
+  | |/
+  | o  15:2d66e189f5b5 add cM
   |/
-  @  13:d66ccb8c5871 add cL
+  @  14:d66ccb8c5871 add cL
   |
-  | x  12:2f7b7704d714 add cL
+  | x  13:2f7b7704d714 add cL
   | |
-  | x  11:fe1634cbe235 add cK
+  | x  12:fe1634cbe235 add cK
   | |
-  | | x  10:53a94305e133 add cL
+  | | x  11:53a94305e133 add cL
+  | | |
+  | | x  10:ad78ff7d621f add cK
   | | |
-  | | x  9:ad78ff7d621f add cK
-  | | |
-  | | | o  8:55c73a90e4b4 add cJ
+  | | | o  9:55c73a90e4b4 add cJ
+  | | | |
+  +-------x  8:e84f73d9ad36 temporary amend commit for 18214586bf78
   | | | |
   o-----+  7:18214586bf78 add cJ
    / / /
@@ -652,13 +656,13 @@
   
 
   $ hg log -G
-  o  15:a438c045eb37 add cN
+  o  16:a438c045eb37 add cN
   |
-  o  14:2d66e189f5b5 add cM
+  o  15:2d66e189f5b5 add cM
   |
-  @  13:d66ccb8c5871 add cL
+  @  14:d66ccb8c5871 add cL
   |
-  | o  8:55c73a90e4b4 add cJ
+  | o  9:55c73a90e4b4 add cJ
   | |
   o |  7:18214586bf78 add cJ
   |/
@@ -685,7 +689,6 @@
   added 2 changesets with 1 changes to 2 files (+1 heads)
   3 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 210589181b14
   (run 'hg heads .' to see heads, 'hg merge' to merge)
 
  Only allow direct access and check that evolve works like before
@@ -697,7 +700,7 @@
   > evolution=createmarkers
   > EOF
 
-  $ hg up 14
+  $ hg up 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (2d66e189f5b5)
   $ cat >> $HGRCPATH <<EOF
@@ -707,13 +710,13 @@
   $ echo "CM" > cM
   $ hg amend
   $ hg log -G
-  @  18:721c3c279519 add cM
+  @  21:721c3c279519 add cM
   |
-  | o  15:a438c045eb37 add cN
+  | o  16:a438c045eb37 add cN
   | |
-  | x  14:2d66e189f5b5 add cM
+  | x  15:2d66e189f5b5 add cM
   |/
-  o  13:d66ccb8c5871 add cL
+  o  14:d66ccb8c5871 add cL
   |
   o  7:18214586bf78 add cJ
   |
@@ -740,11 +743,11 @@
 
   $ hg up a438c045eb37
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg rebase -r 14:: -d 18 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 14:2d66e189f5b5 "add cM", already in destination as 18:721c3c279519 "add cM" (tip)
-  rebasing 15:a438c045eb37 "add cN"
+  $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True
+  note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM"
+  rebasing 16:a438c045eb37 "add cN"
   $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it
-  $ hg up -q 18
+  $ hg up -q 21
 
 Directaccess should load after some extensions precised in the conf
 With no extension specified:
@@ -814,112 +817,87 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
+  2 new obsolescence markers
 
 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase
 it. We expect to not see the stack at the end of the rebase.
-  $ hg log -G  -r "003a4735afde::"
-  x  20:003a4735afde add pk
+  $ hg log -G  -r "25::"
+  @  25:71eb4f100663 add pk
   |
   ~
-  $ hg log -G
-  @  21:71eb4f100663 add pk
-  |
-  | o  19:46cb6daad392 add cN
-  |/
-  o  18:721c3c279519 add cM
-  |
-  | o  16:210589181b14 add cM
-  |/
-  | o  14:2d66e189f5b5 add cM
-  |/
-  o  13:d66ccb8c5871 add cL
-  |
-  | o  8:55c73a90e4b4 add cJ
-  | |
-  o |  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg up -C 46cb6daad392
+  $ hg up -C 22
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit Dk
-  $ hg prune 46cb6daad392 -s 71eb4f100663
+  $ hg prune 22 -s 25
   1 changesets pruned
-  $ hg rebase -s 46cb6daad392 -d 71eb4f100663 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 19:46cb6daad392 "add cN", already in destination as 21:71eb4f100663 "add pk"
-  rebasing 22:7ad60e760c7b "add Dk" (tip)
-  $ hg log -G  -r "71eb4f100663::"
-  @  23:1192fa9fbc68 add Dk
+  $ hg rebase -s 22 -d 25 --config experimental.rebaseskipobsolete=True
+  note: not rebasing 22:46cb6daad392 "add cN", already in destination as 25:71eb4f100663 "add pk"
+  rebasing 26:7ad60e760c7b "add Dk" (tip)
+  $ hg log -G  -r "25::"
+  @  27:1192fa9fbc68 add Dk
   |
-  o  21:71eb4f100663 add pk
+  o  25:71eb4f100663 add pk
   |
   ~
 
 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
 Rebase the first two revs of the stack onto dest, we expect to see one new
 revision on the destination and everything visible.
-  $ hg up 71eb4f100663
+  $ hg up 25
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit Dl
   created new head
   $ mkcommit Dp
   $ mkcommit Do
-  $ hg log -G -r "71eb4f100663::"
-  @  26:b517facce1ef add Do
+  $ hg log -G -r "25::"
+  @  30:b517facce1ef add Do
   |
-  o  25:c5a47ab27c2e add Dp
+  o  29:c5a47ab27c2e add Dp
   |
-  o  24:8c1c2edbaf1b add Dl
+  o  28:8c1c2edbaf1b add Dl
   |
-  | o  23:1192fa9fbc68 add Dk
+  | o  27:1192fa9fbc68 add Dk
   |/
-  o  21:71eb4f100663 add pk
+  o  25:71eb4f100663 add pk
   |
   ~
-  $ hg prune 8c1c2edbaf1b -s 1192fa9fbc68
+  $ hg prune 28 -s 27
   1 changesets pruned
-  $ hg up 71eb4f100663
+  $ hg up 25
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg rebase -r "8c1c2edbaf1b + c5a47ab27c2e" --keep -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
-  rebasing 25:c5a47ab27c2e "add Dp"
-  $ hg log -G  -r "71eb4f100663::"
-  o  27:7d8affb1f604 add Dp
+  $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True
+  note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
+  rebasing 29:c5a47ab27c2e "add Dp"
+  $ hg log -G  -r "25::"
+  o  31:7d8affb1f604 add Dp
   |
-  | o  26:b517facce1ef add Do
+  | o  30:b517facce1ef add Do
   | |
-  | o  25:c5a47ab27c2e add Dp
+  | o  29:c5a47ab27c2e add Dp
   | |
-  | o  24:8c1c2edbaf1b add Dl
+  | o  28:8c1c2edbaf1b add Dl
   | |
-  o |  23:1192fa9fbc68 add Dk
+  o |  27:1192fa9fbc68 add Dk
   |/
-  @  21:71eb4f100663 add pk
+  @  25:71eb4f100663 add pk
   |
   ~
 
 Rebase the same stack in full on the destination, we expect it to disappear
 and only see the top revision added to destination. We don\'t expect 29 to be
 skipped as we used --keep before.
-  $ hg rebase -s 8c1c2edbaf1b -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
-  rebasing 25:c5a47ab27c2e "add Dp"
-  rebasing 26:b517facce1ef "add Do"
-  $ hg log -G  -r "71eb4f100663::"
-  o  28:1d43fff9e26f add Do
+  $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True
+  note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
+  rebasing 29:c5a47ab27c2e "add Dp"
+  rebasing 30:b517facce1ef "add Do"
+  $ hg log -G  -r "25::"
+  o  32:1d43fff9e26f add Do
   |
-  o  27:7d8affb1f604 add Dp
+  o  31:7d8affb1f604 add Dp
   |
-  o  23:1192fa9fbc68 add Dk
+  o  27:1192fa9fbc68 add Dk
   |
-  @  21:71eb4f100663 add pk
+  @  25:71eb4f100663 add pk
   |
   ~