diff -r 04aeaec6ec07 -r 3d917da5bd95 tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve.t	Thu Oct 25 16:33:10 2018 +0200
@@ -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,46 +389,46 @@
   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 --phase-divergent
-  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 aca219761afb
-  working directory is now at aca219761afb
-  $ glog
-  @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
+  committed as 6707c5e1c49d
+  working directory is now at 6707c5e1c49d
+  $ 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 aca219761afb -r 47d52a103155
-  $ hg diff -r aca219761afb^ -r aca219761afb
+  $ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155
+  $ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d
   diff --git a/main-file-1 b/main-file-1
   --- a/main-file-1
   +++ b/main-file-1
@@ -436,26 +442,26 @@
   $ hg commit -m 'dansk 2!'
   $ sed -i'' -e s/Three/tre/ main-file-1
   $ hg commit -m 'dansk 3!'
-  $ hg update aca219761afb
+  $ hg update 6707c5e1c49d
   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,22 +470,22 @@
 (/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!
+  move:[11] dansk 3!
   merging main-file-1
-  working directory is now at 96abb1319a47
+  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
   
@@ -507,7 +513,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 702e4d0a6d86
   $ cd alpha
 
   $ cat << EOF > A
@@ -540,13 +545,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
@@ -565,8 +570,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
@@ -617,8 +621,8 @@
   o  0:8685c6d34325@default(draft) add 0
   
   $ hg debugobsolete
-  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
-  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
 
 Test grab --continue
 
@@ -660,9 +664,9 @@
   o  0:8685c6d34325@default(draft) add 0
   
   $ hg debugobsolete
-  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
-  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
-  a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'pick', 'user': 'test'}
+  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+  a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'user': 'test'}
 
 Test touch
 
@@ -765,10 +769,10 @@
   @    d26d339c513f (12) add 4
   |\
   x |  ce341209337f (4) add 4
-   /     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     rewritten(description, user, content) as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x    cf0c3904643c (11) add 3
-  |\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     rewritten(description, user, parent, content) as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | \
   | |\
@@ -785,19 +789,18 @@
       more than 2 successors:         0
       available  keys:
                   ef1:               10
-            operation:               10
                  user:               10
   marker size:
       format v1:
-          smallest length:           90
-          longer length:             92
-          median length:             91
-          mean length:               90
-      format v0:
           smallest length:           * (glob)
           longer length:             * (glob)
           median length:             * (glob)
           mean length:               * (glob)
+      format v0:
+          smallest length:           72
+          longer length:             73
+          median length:             73
+          mean length:               72
   disconnected clusters:              1
           any known node:             1
           smallest length:           10
@@ -827,7 +830,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 +847,13 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
-  @  13:284c0d45770d@default(draft) Folding with custom commit message
+  @  16:98cb758db56d@default(draft) Folding with custom commit message
   |
-  o  10:9975c016fe7b@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 +866,10 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qlog
-  14 - 8693d0f277b8 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 +907,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 +929,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 +953,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 +983,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 +1010,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,117 +1047,105 @@
 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')" --phase-divergent
-  recreate:[11] add new file bumped
-  atop:[10] a2
+  recreate:[12] add new file bumped
+  atop:[11] a2
   computing new diff
-  committed as a8bb31d4b7f2
-  working directory is now at a8bb31d4b7f2
+  committed as f15d32934071
+  working directory is now at f15d32934071
   $ hg evolve --any
-  move:[8] a3
-  atop:[12] phase-divergent update to d952e93add6f:
-  working directory is now at b88539ad24d7
-  $ glog
-  @  13:b88539ad24d7@default(draft) a3
-  |
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
-  |
-  o  10:d952e93add6f@mybranch(public) a2
-  |
-  o  9:9f8b83c2e7f3@default(public) a1__
-  |
-  o  0:07c1c36d9ef0@default(public) a0
-  
-
+  move:[9] a3
+  atop:[13] bumped update to d952e93add6f:
+  working directory is now at cce26b684bfe
 Check that we can resolve troubles in a revset with more than one commit
-  $ hg up b88539ad24d7 -C
+  $ hg up cce26b684bfe -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit gg
-  $ hg up b88539ad24d7
+  $ hg up cce26b684bfe
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit gh
   created new head
-  $ hg up b88539ad24d7
+  $ hg up cce26b684bfe
   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	: phase-divergent 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:0cf3707e8971@default(draft) a3
+  2 new unstable changesets
+  $ hg log -G
+  @  18	: a3 - test
   |
-  | o  15:daa1ff1c7fbd@default(draft) add gh
+  | o  16	: add gh - test
   | |
-  | | o  14:484fb3cfa7f2@default(draft) add gg
+  | | o  15	: add gg - test
   | |/
-  | x  13:b88539ad24d7@default(draft) a3
+  | x  14	: a3 - test
   |/
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent 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
-  $ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2"
+  $ hg evolve --rev "beb41503aa3e and 27247fcb2df6"
   set of specified revisions is empty
   [1]
 
-  $ hg evolve --rev "b88539ad24d7::" --phase-divergent
+  $ hg evolve --rev "cce26b684bfe::" --phase-divergent
   no phasedivergent changesets in specified revisions
   (do you want to use --orphan)
   [2]
-  $ hg evolve --rev "b88539ad24d7::" --orphan
-  move:[14] add gg
-  atop:[16] a3
-  move:[15] add gh
-  atop:[16] a3
-  working directory is now at 0c049e4e5422
-  $ glog
-  @  18:0c049e4e5422@default(draft) add gh
+  $ hg evolve --rev "cce26b684bfe::" --orphan
+  move:[15] add gg
+  atop:[18] a3
+  move:[16] add gh
+  atop:[18] a3
+  working directory is now at e02107f98737
+  $ hg log -G
+  @  20	: add gh - test
   |
-  | o  17:98e171e2f272@default(draft) add gg
+  | o  19	: add gg - test
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18	: a3 - test
   |
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent 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
@@ -1253,16 +1244,16 @@
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 
   $ hg --hidden up 14
-  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory parent is obsolete! (484fb3cfa7f2)
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  working directory parent is obsolete! (cce26b684bfe)
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolutioncommands=evolve
   > EOF
   $ hg --hidden up 15
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory parent is obsolete! (daa1ff1c7fbd)
-  (use 'hg evolve' to update to its successor: 0c049e4e5422)
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory parent is obsolete! (27247fcb2df6)
+  (use 'hg evolve' to update to its successor: 24e63b319adf)
 
 Restore all of the evolution features
 
@@ -1272,8 +1263,8 @@
   > EOF
 
 Check hg evolve --rev on singled out commit
-  $ hg up 98e171e2f272 -C
-  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg up 24e63b319adf -C
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit j1
   $ mkcommit j2
   $ mkcommit j3
@@ -1282,29 +1273,29 @@
   $ echo "hello" > j4
   $ hg add j4
   $ hg amend
-  2 new orphan changesets
-  $ glog -r "0cf3707e8971::"
-  @  22:274b6cd0c101@default(draft) add j1
+  2 new unstable changesets
+  $ glog -r "edc3c9de504e::"
+  @  25:8dc373be86d9@default(draft) add j1
   |
-  | o  21:89e4f7e8feb5@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:4cd61236beca@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  19:0fd8bfb02de4@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
-  $ hg evolve --rev 89e4f7e8feb5 --any
+  $ hg evolve --rev d7eadcf6eccd --any
   abort: cannot specify both "--rev" and "--any"
   [255]
-  $ hg evolve --rev 89e4f7e8feb5
-  cannot solve instability of 89e4f7e8feb5, skipping
+  $ hg evolve --rev d7eadcf6eccd
+  cannot solve instability of d7eadcf6eccd, skipping
 
 Check that uncommit respects the allowunstable option
 With only createmarkers we can only uncommit on a head
@@ -1312,84 +1303,84 @@
   > [experimental]
   > evolution=createmarkers, allnewcommands
   > EOF
-  $ hg up 274b6cd0c101^
+  $ hg up 8dc373be86d9^
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg uncommit --all
   abort: uncommit will orphan 4 descendants
   (see 'hg help evolution.instability')
   [255]
-  $ hg up 274b6cd0c101
+  $ hg up 8dc373be86d9
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg uncommit --all
   new changeset is empty
   (use 'hg prune .' to remove it)
-  $ glog -r "0cf3707e8971::"
-  @  23:0ef9ff75f8e2@default(draft) add j1
+  $ glog -r "edc3c9de504e::"
+  @  26:044804d0c10d@default(draft) add j1
   |
-  | o  21:89e4f7e8feb5@default(draft) add j3
+  | o  23:d7eadcf6eccd@default(draft) add j3
   | |
-  | o  20:4cd61236beca@default(draft) add j2
+  | o  22:2223ea564144@default(draft) add j2
   | |
-  | x  19:0fd8bfb02de4@default(draft) add j1
+  | x  21:48490698b269@default(draft) add j1
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
 Check that prune respects the allowunstable option
   $ hg up -C .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg up 0c049e4e5422
+  $ hg up e02107f98737
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg evolve --all
   nothing to evolve on current working copy parent
   (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
-  working directory is now at 0d9203b74542
-  $ glog -r "0cf3707e8971::"
-  @  25:0d9203b74542@default(draft) add j3
+  move:[22] add j2
+  atop:[26] add j1
+  move:[23] add j3
+  working directory is now at c9a20e2d74aa
+  $ glog -r "edc3c9de504e::"
+  @  28:c9a20e2d74aa@default(draft) add j3
   |
-  o  24:f1b85956c48c@default(draft) add j2
+  o  27:b0e3066231e2@default(draft) add j2
   |
-  o  23:0ef9ff75f8e2@default(draft) add j1
+  o  26:044804d0c10d@default(draft) add j1
   |
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
-  $ hg up 98e171e2f272
+  $ hg up 19
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit c5_
   created new head
-  $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
+  $ hg prune '044804d0c10d + b0e3066231e2'
   abort: touch will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
-  $ hg prune '98e171e2f272::0d9203b74542'
+  $ hg prune '24e63b319adf::c9a20e2d74aa'
   abort: touch will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
-  $ hg prune '0ef9ff75f8e2::'
+  $ hg prune '044804d0c10d::'
   3 changesets pruned
-  $ glog -r "0cf3707e8971::"
-  @  26:4c6f6f6d1976@default(draft) add c5_
+  $ glog -r "edc3c9de504e::"
+  @  29:2251801b6c91@default(draft) add c5_
   |
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1397,24 +1388,24 @@
 
 (most of this has been moved to test-fold.t)
 
-  $ hg up 0cf3707e8971
+  $ hg up edc3c9de504e
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit unstableifparentisfolded
   created new head
-  $ glog -r "0cf3707e8971::"
-  @  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+  $ glog -r "edc3c9de504e::"
+  @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |
-  | o  26:4c6f6f6d1976@default(draft) add c5_
+  | o  29:2251801b6c91@default(draft) add c5_
   | |
-  +---o  18:0c049e4e5422@default(draft) add gh
+  +---o  20:e02107f98737@default(draft) add gh
   | |
-  | o  17:98e171e2f272@default(draft) add gg
+  | o  19:24e63b319adf@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
-  $ hg fold --exact "98e171e2f272::"
+  $ hg fold --exact "24e63b319adf::"
   2 changesets folded
 
 Check that evolve shows error while handling split commits
@@ -1425,14 +1416,14 @@
   > evolution=all
   > EOF
 
-  $ glog -r "0cf3707e8971::"
-  o  28:92ca6f3984de@default(draft) add gg
+  $ glog -r "edc3c9de504e::"
+  o  31:580886d07058@default(draft) add gg
   |
-  | @  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+  | @  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
 
@@ -1442,7 +1433,7 @@
   $ hg add oo pp
   $ hg commit -m "oo+pp"
   $ mkcommit uu
-  $ hg up 2d1b55e10be9
+  $ hg up 68330ac625b8
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ printf "oo" > oo;
   $ hg add oo
@@ -1453,29 +1444,29 @@
   $ hg commit -m "_pp"
   $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
   1 changesets pruned
-  1 new orphan changesets
-  $ glog -r "0cf3707e8971::"
-  @  32:c7dbf668e9d5@default(draft) _pp
+  1 new unstable changesets
+  $ glog -r "edc3c9de504e::"
+  @  35:7a555adf2b4a@default(draft) _pp
   |
-  o  31:2b5a32114b3d@default(draft) _oo
+  o  34:2be4d2d5bf34@default(draft) _oo
   |
-  | o  30:4d122571f3b6@default(draft) add uu
+  | o  33:53f0c003e03e@default(draft) add uu
   | |
-  | x  29:7da3e73df8a5@default(draft) oo+pp
+  | x  32:1bf2152f4f82@default(draft) oo+pp
   |/
-  | o  28:92ca6f3984de@default(draft) add gg
+  | o  31:580886d07058@default(draft) add gg
   | |
-  o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+  o |  30:68330ac625b8@default(draft) add unstableifparentisfolded
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  20:e02107f98737@default(draft) add gh
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  18:edc3c9de504e@default(draft) a3
   |
   ~
-  $ hg evolve --rev "0cf3707e8971::"
-  move:[30] add uu
-  atop:[32] _pp
-  working directory is now at be23044af550
+  $ hg evolve --rev "edc3c9de504e::"
+  move:[33] add uu
+  atop:[35] _pp
+  working directory is now at 43c3f5ef149f
 
 
 Check that dirstate changes are kept at failure for conflicts (issue4966)
@@ -1484,7 +1475,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"
@@ -1494,55 +1485,34 @@
   $ hg add newlyadded
   $ hg commit -m "will cause conflict at evolve"
 
-  $ glog -r "0cf3707e8971::"
-  @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
-  |
-  o  35:7cc12c6c7862@default(draft) will be evolved safely
-  |
-  o  34:98c7ab460e6b@default(draft) will be amended
-  |
-  o  33:be23044af550@default(draft) add uu
-  |
-  o  32:c7dbf668e9d5@default(draft) _pp
-  |
-  o  31:2b5a32114b3d@default(draft) _oo
-  |
-  | o  28:92ca6f3984de@default(draft) add gg
-  | |
-  o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
-  |/
-  | o  18:0c049e4e5422@default(draft) add gh
-  |/
-  o  16:0cf3707e8971@default(draft) a3
-  |
-  ~
-
-  $ hg update -q 98c7ab460e6b
+  $ hg update -q 36030b147271
   $ echo "amended" > newfile
   $ hg amend -m "amended"
-  2 new orphan changesets
+  2 new unstable changesets
 
-  $ hg evolve --rev "98c7ab460e6b::"
-  move:[35] will be evolved safely
-  atop:[37] amended
-  move:[36] will cause conflict at evolve
+  $ hg evolve --rev "36030b147271::"
+  move:[38] will be evolved safely
+  atop:[41] amended
+  move:[39] will cause conflict at evolve
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
-  $ glog -r "be23044af550::" --hidden
-  @  38:61abd81de026@default(draft) will be evolved safely
+  $ glog -r "43c3f5ef149f::" --hidden
+  @  42:c904da5245b0@default(draft) will be evolved safely
   |
-  o  37:df89d30f23e2@default(draft) amended
+  o  41:34ae045ec400@default(draft) amended
   |
-  | @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
-  | |
-  | x  35:7cc12c6c7862@default(draft) will be evolved safely
+  | x  40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271
   | |
-  | x  34:98c7ab460e6b@default(draft) will be amended
+  | | @  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:be23044af550@default(draft) add uu
+  o  36:43c3f5ef149f@default(draft) add uu
   |
   ~
 
@@ -1565,7 +1535,7 @@
   $ hg amend
 
   $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
-  @  1:ab832e43dd5a added a
+  @  2:ab832e43dd5a added a
   
   $ hg up f7ad41964313 --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1575,12 +1545,14 @@
   $ hg bookmark book
 
   $ hg evolve
-  update:[1] added a
+  update:[2] added a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at ab832e43dd5a
 
   $ hg log -GT "{rev}:{node|short} {desc} ({bookmarks})\n" --hidden
-  @  1:ab832e43dd5a added a (book)
+  @  2:ab832e43dd5a added a (book)
   
+  x  1:9d806b52d1c5 temporary amend commit for f7ad41964313 ()
+  |
   x  0:f7ad41964313 added a ()