Mercurial > evolve

changeset 6317:53d63b608230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: stop preserving all of {extras} for uninterrupted evolve operations I doubt the wisdom of doing this, but the case of completing interrupted evolves does this, as do core commands for amend, graft, and rebase in hg ce9696193175, bb14a81ce647, and b698abf971e7. Note the obslog order (and DAG display) change in test-evolve-content-divergent-relocation.t around line 131. I have no idea why that would happen, or if it's an indicator of something subtle going on.
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 07 Oct 2022 20:32:14 -0400
parents b1d1f4ade142
children 3e488afe62f5
files hgext3rd/evolve/evolvecmd.py tests/test-evolve-content-divergent-case-A3.t tests/test-evolve-content-divergent-case-B1.t tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-content-divergent-relocation.t tests/test-evolve-content-divergent-stack.t tests/test-evolve-continue.t tests/test-evolve-noupdate.t tests/test-evolve-order.t tests/test-evolve-phase-divergence.t tests/test-evolve-public-content-divergent-corner-cases.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-prev-next.t tests/test-stabilize-order.t tests/test-unstability-resolution-result.t
diffstat 17 files changed, 615 insertions(+), 616 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Fri Oct 07 18:14:58 2022 -0400
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Oct 07 20:32:14 2022 -0400
@@ -969,9 +969,8 @@
         extra[b'intermediate-source'] = s
 
 def _relocatecommit(repo, orig, dest, pctx, keepbranch, commitmsg, update):
-    extra = dict(orig.extra())
-    if b'branch' in extra:
-        del extra[b'branch']
+    extra = {}
+    _savegraft(orig, extra)
     extra[b'rebase_source'] = orig.hex()
     targetphase = max(orig.phase(), phases.draft)
     configoverrides = {
--- a/tests/test-evolve-content-divergent-case-A3.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-case-A3.t	Fri Oct 07 20:32:14 2022 -0400
@@ -125,10 +125,10 @@
   base: [3] C
   rebasing "other" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 3ad062d48137
+  working directory is now at b341bfa8675e
 
   $ hg log -G
-  @  7:3ad062d48137 (draft): C
+  @  7:b341bfa8675e (draft): C
   |
   o  2:f6fbb35d8ac9 (draft): B
   |
@@ -137,8 +137,8 @@
   o  0:a9bdc8b26820 (public): O
   
   $ hg log -pl 1
-  7:3ad062d48137 (draft): C 
-  diff -r f6fbb35d8ac9 -r 3ad062d48137 C
+  7:b341bfa8675e (draft): C 
+  diff -r f6fbb35d8ac9 -r b341bfa8675e C
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/C	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -178,10 +178,10 @@
   base: [3] C
   rebasing "divergent" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 8f91b97f6f9a
+  working directory is now at 0de314083dd2
 
   $ hg log -G
-  @  7:8f91b97f6f9a (draft): C
+  @  7:0de314083dd2 (draft): C
   |
   o  2:f6fbb35d8ac9 (draft): B
   |
@@ -192,8 +192,8 @@
   $ hg evolve -l
 
   $ hg log -pl1
-  7:8f91b97f6f9a (draft): C 
-  diff -r f6fbb35d8ac9 -r 8f91b97f6f9a C
+  7:0de314083dd2 (draft): C 
+  diff -r f6fbb35d8ac9 -r 0de314083dd2 C
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/C	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
--- a/tests/test-evolve-content-divergent-case-B1.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-case-B1.t	Fri Oct 07 20:32:14 2022 -0400
@@ -137,7 +137,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg log -G
-  o  9:6f740085e668 (draft): new_B
+  o  9:55f09418c9b0 (draft): new_B
   |
   @  5:45ed635c7cfc (draft): latest_A
   |
@@ -181,10 +181,10 @@
   base: [2] B
   rebasing "divergent" content-divergent changeset 807cc2b37fb3 on 1ffcccee011c
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 2431e876af63
+  working directory is now at 6b611864f3f6
 
   $ hg log -G
-  @  8:2431e876af63 (draft): new_B [orphan]
+  @  8:6b611864f3f6 (draft): new_B [orphan]
   |
   | o  6:45ed635c7cfc (draft): latest_A
   | |
@@ -193,6 +193,6 @@
   o  0:a9bdc8b26820 (public): O
   
   $ hg evolve -l
-  2431e876af63: new_B
+  6b611864f3f6: new_B
     orphan: 1ffcccee011c (obsolete parent)
   
--- a/tests/test-evolve-content-divergent-corner-cases.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri Oct 07 20:32:14 2022 -0400
@@ -379,10 +379,10 @@
   You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
   What do you want to do? c
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 050a5d9ba60d
+  working directory is now at 8bcf0a598b0d
 
   $ hg glog -l1
-  @  8:050a5d9ba60d updated e
+  @  8:8bcf0a598b0d updated e
   |   () [default] draft
   ~
 
@@ -390,15 +390,15 @@
   8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 de4ea3103326293994c634101e780724346ee89f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
   9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
-  ff6f7cd76a7c97d938e8fe87f0fc816b66929435 8883bfaa2d02c8c54b6278551324187019862599 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  8883bfaa2d02c8c54b6278551324187019862599 050a5d9ba60d423b4401803509457515297edcf4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  de4ea3103326293994c634101e780724346ee89f 050a5d9ba60d423b4401803509457515297edcf4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  ff6f7cd76a7c97d938e8fe87f0fc816b66929435 8da34ee32eee606a1fca89e76ce48dcfb0e2598b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  8da34ee32eee606a1fca89e76ce48dcfb0e2598b 8bcf0a598b0d242cb58758d78acd77e874251eef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  de4ea3103326293994c634101e780724346ee89f 8bcf0a598b0d242cb58758d78acd77e874251eef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
-  @    050a5d9ba60d (8) updated e
-  |\     amended(content) from 8883bfaa2d02 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @    8bcf0a598b0d (8) updated e
+  |\     amended(content) from 8da34ee32eee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |    rewritten from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  8883bfaa2d02 (7) updated e
+  x |  8da34ee32eee (7) updated e
   | |    rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  de4ea3103326 (6) updated e
--- a/tests/test-evolve-content-divergent-interrupted.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-interrupted.t	Fri Oct 07 20:32:14 2022 -0400
@@ -567,11 +567,11 @@
   $ hg next
   move:[5] added d
   atop:[8] added c
-  working directory is now at dc9ba677cba1
+  working directory is now at 543adc7eac82
   $ echo "latest_changes" >> a
   $ hg amend
   $ hg glog
-  @  10:0892835a581f added d
+  @  10:13a3da452f7f added d
   |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft
@@ -588,7 +588,7 @@
   merge:[7] added d
   with: [10] added d
   base: [4] added d
-  rebasing "other" content-divergent changeset 0892835a581f on c7586e2a9264
+  rebasing "other" content-divergent changeset 13a3da452f7f on c7586e2a9264
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -605,7 +605,7 @@
   +=======
   +some_changes
   +latest_changes
-  +>>>>>>> evolving:    0892835a581f - test: added d
+  +>>>>>>> evolving:    13a3da452f7f - test: added d
   diff -r c7586e2a9264 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
@@ -614,10 +614,10 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at 0892835a581f
+  working directory is now at 13a3da452f7f
 
   $ hg glog
-  @  10:0892835a581f added d
+  @  10:13a3da452f7f added d
   |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft
--- a/tests/test-evolve-content-divergent-relocation.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-relocation.t	Fri Oct 07 20:32:14 2022 -0400
@@ -97,10 +97,10 @@
   base: [2] added b
   rebasing "divergent" content-divergent changeset 7ed0642d644b on 8fa14d15e168
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at c5862ade0278
+  working directory is now at bd76a775c527
 
   $ hg glog
-  @  8:c5862ade0278 added b
+  @  8:bd76a775c527 added b
   |   () [default] draft
   | *  4:c41c793e0ef1 added d
   | |   () [default] draft
@@ -118,11 +118,11 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID c5862ade02783a99f46082f4f0483c449fc4c3f2
+  # Node ID bd76a775c52744611afa76b4980e0b46a7a105f5
   # Parent  8fa14d15e1684a9720b1b065aba9d5ea51024cb2
   added b
   
-  diff -r 8fa14d15e168 -r c5862ade0278 b
+  diff -r 8fa14d15e168 -r bd76a775c527 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -131,21 +131,21 @@
   $ hg debugobsolete
   b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  da4b96f4a8d610a85b225583138f681d67e275dd c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 df708ef51071b9b7932664cb88742483ffa6c0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  df708ef51071b9b7932664cb88742483ffa6c0af bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  da4b96f4a8d610a85b225583138f681d67e275dd bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
-  @    c5862ade0278 (8) added b
-  |\     rewritten from 2ec52f302b0f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |    amended(content) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @    bd76a775c527 (8) added b
+  |\     amended(content) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from df708ef51071 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  2ec52f302b0f (7) added b
+  x |  da4b96f4a8d6 (6) added b
+  | |    rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
+  | x  df708ef51071 (7) added b
   | |    rebased(parent) from 7ed0642d644b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  da4b96f4a8d6 (6) added b
-  | |    rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |
-  x |  7ed0642d644b (5) added b
+  | x  7ed0642d644b (5) added b
   |/     amended(content) from b1661037fa25 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  b1661037fa25 (2) added b
@@ -158,11 +158,11 @@
   atop:[8] added b
   move:[4] added d
   $ hg glog
-  o  10:25cb1649b463 added d
+  o  10:44c908a29dde added d
   |   () [default] draft
-  o  9:81ead2f9fc61 added c
+  o  9:905d3f000de6 added c
   |   () [default] draft
-  @  8:c5862ade0278 added b
+  @  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -174,7 +174,7 @@
   $ echo x > x
   $ hg ci -Aqm "added x"
   $ hg glog -r .
-  @  11:f220d694b3a6 added x
+  @  11:2eea3a452f03 added x
   |   () [default] draft
   ~
 
@@ -186,24 +186,24 @@
 
   $ hg up 'predecessors(.)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset f220d694b3a6
-  (hidden revision 'f220d694b3a6' was rewritten as: 91939f44a1fe)
-  working directory parent is obsolete! (f220d694b3a6)
-  (use 'hg evolve' to update to its successor: 91939f44a1fe)
+  updated to hidden changeset 2eea3a452f03
+  (hidden revision '2eea3a452f03' was rewritten as: f9c46439290c)
+  working directory parent is obsolete! (2eea3a452f03)
+  (use 'hg evolve' to update to its successor: f9c46439290c)
   $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True
-  rebasing 11:f220d694b3a6 "added x"
+  rebasing 11:2eea3a452f03 "added x"
   2 new content-divergent changesets
 
   $ hg glog
-  @  13:7af6be6736c0 added x
+  @  13:03d7f147ff42 added x
   |   () [default] draft
-  | *  12:91939f44a1fe added foo to x
+  | *  12:f9c46439290c added foo to x
   | |   () [bar] draft
-  o |  10:25cb1649b463 added d
+  o |  10:44c908a29dde added d
   | |   () [default] draft
-  o |  9:81ead2f9fc61 added c
+  o |  9:905d3f000de6 added c
   |/    () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -214,9 +214,9 @@
   merge:[12] added foo to x
   with: [13] added x
   base: [11] added x
-  rebasing "divergent" content-divergent changeset 91939f44a1fe on 25cb1649b463
+  rebasing "divergent" content-divergent changeset f9c46439290c on 44c908a29dde
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 3c4c7420a968
+  working directory is now at 60f40a789d85
 
   $ hg exp
   # HG changeset patch
@@ -224,11 +224,11 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch bar
-  # Node ID 3c4c7420a968a3f76d61fa16c3af9abe115f07b6
-  # Parent  25cb1649b46389f8e6e77c3796f01b37996b8fcd
+  # Node ID 60f40a789d85a42549e1e10c27779cfb5d5e1e1c
+  # Parent  44c908a29dde4b2a7fd1fa5714177b99a2423bbb
   added foo to x
   
-  diff -r 25cb1649b463 -r 3c4c7420a968 x
+  diff -r 44c908a29dde -r 60f40a789d85 x
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -237,13 +237,13 @@
 The above `hg exp` and the following log call demonstrates that message, content
 and branch change is preserved in case of relocation
   $ hg glog
-  @  15:3c4c7420a968 added foo to x
+  @  15:60f40a789d85 added foo to x
   |   () [bar] draft
-  o  10:25cb1649b463 added d
+  o  10:44c908a29dde added d
   |   () [default] draft
-  o  9:81ead2f9fc61 added c
+  o  9:905d3f000de6 added c
   |   () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -253,31 +253,31 @@
   $ hg debugobsolete
   b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  da4b96f4a8d610a85b225583138f681d67e275dd c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  ca1b80f7960aae2306287bab52b4090c59af8c29 81ead2f9fc6156de69d12b7b5df71c34ab8b9c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c41c793e0ef1ddb463e85ea9491e377d01127ba2 25cb1649b46389f8e6e77c3796f01b37996b8fcd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 91939f44a1fe6d865ec791122014971dfff75129 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 7af6be6736c0aebd226820373190e636fe9f16e9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  91939f44a1fe6d865ec791122014971dfff75129 c38f731f5ae01e417ceeea09f046febf4536d356 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c38f731f5ae01e417ceeea09f046febf4536d356 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  7af6be6736c0aebd226820373190e636fe9f16e9 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 df708ef51071b9b7932664cb88742483ffa6c0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  df708ef51071b9b7932664cb88742483ffa6c0af bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  da4b96f4a8d610a85b225583138f681d67e275dd bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  ca1b80f7960aae2306287bab52b4090c59af8c29 905d3f000de6ac0cdca8ed4bd222bf08ddb4b6d4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  c41c793e0ef1ddb463e85ea9491e377d01127ba2 44c908a29dde4b2a7fd1fa5714177b99a2423bbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d f9c46439290cf371c88424caaefc92398d808666 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d 03d7f147ff4243d7ac83eba7047ab8847da35c91 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  f9c46439290cf371c88424caaefc92398d808666 45cdf781a3eac63e762b68047e0beee60a47a805 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  45cdf781a3eac63e762b68047e0beee60a47a805 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  03d7f147ff4243d7ac83eba7047ab8847da35c91 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
-  @    3c4c7420a968 (15) added foo to x
-  |\     rewritten(description, branch, content) from 7af6be6736c0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |    rewritten from c38f731f5ae0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @    60f40a789d85 (15) added foo to x
+  |\     rewritten(description, branch, content) from 03d7f147ff42 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten from 45cdf781a3ea using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  7af6be6736c0 (13) added x
-  | |    rebased(parent) from f220d694b3a6 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  x |  03d7f147ff42 (13) added x
+  | |    rebased(parent) from 2eea3a452f03 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  c38f731f5ae0 (14) added foo to x
-  | |    rebased(parent) from 91939f44a1fe using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  45cdf781a3ea (14) added foo to x
+  | |    rebased(parent) from f9c46439290c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  91939f44a1fe (12) added foo to x
-  |/     rewritten(description, branch, content) from f220d694b3a6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  f9c46439290c (12) added foo to x
+  |/     rewritten(description, branch, content) from 2eea3a452f03 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  f220d694b3a6 (11) added x
+  x  2eea3a452f03 (11) added x
   
 
 Testing when both the content-divergence are on different parents and resolution
@@ -290,7 +290,7 @@
   $ echo y > y
   $ hg ci -Aqm "added y"
   $ hg glog -r .
-  @  16:d84c9e99d55b added y
+  @  16:6cba24390b74 added y
   |   () [default] draft
   ~
 
@@ -299,28 +299,28 @@
 
   $ hg up 'predecessors(.)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset d84c9e99d55b
-  (hidden revision 'd84c9e99d55b' was rewritten as: 98cd38d20303)
-  working directory parent is obsolete! (d84c9e99d55b)
-  (use 'hg evolve' to update to its successor: 98cd38d20303)
+  updated to hidden changeset 6cba24390b74
+  (hidden revision '6cba24390b74' was rewritten as: 347339f712be)
+  working directory parent is obsolete! (6cba24390b74)
+  (use 'hg evolve' to update to its successor: 347339f712be)
   $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True
-  rebasing 16:d84c9e99d55b "added y"
+  rebasing 16:6cba24390b74 "added y"
   2 new content-divergent changesets
   $ echo wat > y
   $ hg amend
 
   $ hg glog
-  @  19:ec9ec45c397e added y
+  @  19:7734a6171413 added y
   |   () [bar] draft
-  | *  17:98cd38d20303 added y
+  | *  17:347339f712be added y
   | |   () [default] draft
-  o |  15:3c4c7420a968 added foo to x
+  o |  15:60f40a789d85 added foo to x
   | |   () [bar] draft
-  o |  10:25cb1649b463 added d
+  o |  10:44c908a29dde added d
   | |   () [default] draft
-  o |  9:81ead2f9fc61 added c
+  o |  9:905d3f000de6 added c
   |/    () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -331,7 +331,7 @@
   merge:[17] added y
   with: [19] added y
   base: [16] added y
-  rebasing "divergent" content-divergent changeset 98cd38d20303 on 3c4c7420a968
+  rebasing "divergent" content-divergent changeset 347339f712be on 60f40a789d85
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -344,18 +344,18 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  working directory is now at 26dd4974d99f
+  working directory is now at a1a5f649aad4
 
   $ hg glog
-  @  21:26dd4974d99f added y
+  @  21:a1a5f649aad4 added y
   |   () [bar] draft
-  o  15:3c4c7420a968 added foo to x
+  o  15:60f40a789d85 added foo to x
   |   () [bar] draft
-  o  10:25cb1649b463 added d
+  o  10:44c908a29dde added d
   |   () [default] draft
-  o  9:81ead2f9fc61 added c
+  o  9:905d3f000de6 added c
   |   () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -365,40 +365,40 @@
   $ hg debugobsolete
   b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  da4b96f4a8d610a85b225583138f681d67e275dd c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  ca1b80f7960aae2306287bab52b4090c59af8c29 81ead2f9fc6156de69d12b7b5df71c34ab8b9c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c41c793e0ef1ddb463e85ea9491e377d01127ba2 25cb1649b46389f8e6e77c3796f01b37996b8fcd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 91939f44a1fe6d865ec791122014971dfff75129 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 7af6be6736c0aebd226820373190e636fe9f16e9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  91939f44a1fe6d865ec791122014971dfff75129 c38f731f5ae01e417ceeea09f046febf4536d356 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c38f731f5ae01e417ceeea09f046febf4536d356 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  7af6be6736c0aebd226820373190e636fe9f16e9 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
-  d84c9e99d55bfa499ab77dabd1fb3035e8f14ba9 98cd38d203030c04c89650c7280a6a71ae2f748c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  d84c9e99d55bfa499ab77dabd1fb3035e8f14ba9 6c3124aac43f4c0e64155b93ea60e0e10abd6ba1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
-  6c3124aac43f4c0e64155b93ea60e0e10abd6ba1 ec9ec45c397e15dfd9f25a91b6ffa1e17f9b9471 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  98cd38d203030c04c89650c7280a6a71ae2f748c 5ddc0bec0e2650fb56e3b5d24f7c7c3a61401fbe 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  5ddc0bec0e2650fb56e3b5d24f7c7c3a61401fbe 26dd4974d99f30b9c9b259e22254b29474155d45 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
-  ec9ec45c397e15dfd9f25a91b6ffa1e17f9b9471 26dd4974d99f30b9c9b259e22254b29474155d45 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 df708ef51071b9b7932664cb88742483ffa6c0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  df708ef51071b9b7932664cb88742483ffa6c0af bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  da4b96f4a8d610a85b225583138f681d67e275dd bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  ca1b80f7960aae2306287bab52b4090c59af8c29 905d3f000de6ac0cdca8ed4bd222bf08ddb4b6d4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  c41c793e0ef1ddb463e85ea9491e377d01127ba2 44c908a29dde4b2a7fd1fa5714177b99a2423bbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d f9c46439290cf371c88424caaefc92398d808666 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d 03d7f147ff4243d7ac83eba7047ab8847da35c91 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  f9c46439290cf371c88424caaefc92398d808666 45cdf781a3eac63e762b68047e0beee60a47a805 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  45cdf781a3eac63e762b68047e0beee60a47a805 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  03d7f147ff4243d7ac83eba7047ab8847da35c91 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+  6cba24390b749067bef92c44e0288e6f554bfb37 347339f712becdde80c9ad13d22a497db6086d90 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  6cba24390b749067bef92c44e0288e6f554bfb37 24f8adc447ef80b160e63ae48688e98cb737166f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+  24f8adc447ef80b160e63ae48688e98cb737166f 7734a6171413c2df9c39102accf4bc21cbc5bd9a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  347339f712becdde80c9ad13d22a497db6086d90 6f720dea6f607e618f51c0cf1b07f8415de5e23e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  6f720dea6f607e618f51c0cf1b07f8415de5e23e a1a5f649aad404acfddaa979465e96581c2ce0fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+  7734a6171413c2df9c39102accf4bc21cbc5bd9a a1a5f649aad404acfddaa979465e96581c2ce0fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog -r . --all
-  @    26dd4974d99f (21) added y
-  |\     rewritten(branch, content) from 5ddc0bec0e26 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |    amended(content) from ec9ec45c397e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @    a1a5f649aad4 (21) added y
+  |\     rewritten(branch, content) from 6f720dea6f60 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 7734a6171413 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  5ddc0bec0e26 (20) added y
-  | |    rebased(parent) from 98cd38d20303 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  x |  6f720dea6f60 (20) added y
+  | |    rebased(parent) from 347339f712be using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  ec9ec45c397e (19) added y
-  | |    amended(content) from 6c3124aac43f using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  7734a6171413 (19) added y
+  | |    amended(content) from 24f8adc447ef using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  6c3124aac43f (18) added y
-  | |    rewritten(branch, parent) from d84c9e99d55b using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  24f8adc447ef (18) added y
+  | |    rewritten(branch, parent) from 6cba24390b74 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  98cd38d20303 (17) added y
-  |/     amended(content) from d84c9e99d55b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  x |  347339f712be (17) added y
+  |/     amended(content) from 6cba24390b74 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  d84c9e99d55b (16) added y
+  x  6cba24390b74 (16) added y
   
 
 checking that relocated commit is there
@@ -407,11 +407,11 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 5ddc0bec0e2650fb56e3b5d24f7c7c3a61401fbe
-  # Parent  3c4c7420a968a3f76d61fa16c3af9abe115f07b6
+  # Node ID 6f720dea6f607e618f51c0cf1b07f8415de5e23e
+  # Parent  60f40a789d85a42549e1e10c27779cfb5d5e1e1c
   added y
   
-  diff -r 3c4c7420a968 -r 5ddc0bec0e26 y
+  diff -r 60f40a789d85 -r 6f720dea6f60 y
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -421,15 +421,15 @@
 ----------------------------------------------------------------------
 
   $ hg glog
-  @  21:26dd4974d99f added y
+  @  21:a1a5f649aad4 added y
   |   () [bar] draft
-  o  15:3c4c7420a968 added foo to x
+  o  15:60f40a789d85 added foo to x
   |   () [bar] draft
-  o  10:25cb1649b463 added d
+  o  10:44c908a29dde added d
   |   () [default] draft
-  o  9:81ead2f9fc61 added c
+  o  9:905d3f000de6 added c
   |   () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -442,7 +442,7 @@
   $ echo z > z
   $ hg ci -Aqm "added z"
   $ hg glog -r .
-  @  22:136e58088ce2 added z
+  @  22:e308b18e59ab added z
   |   () [default] draft
   ~
 
@@ -452,30 +452,30 @@
 
   $ hg up 'predecessors(.)' --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset 136e58088ce2
-  (hidden revision '136e58088ce2' was rewritten as: f4c3594c72e7)
-  working directory parent is obsolete! (136e58088ce2)
-  (use 'hg evolve' to update to its successor: f4c3594c72e7)
+  updated to hidden changeset e308b18e59ab
+  (hidden revision 'e308b18e59ab' was rewritten as: 20885f9c4458)
+  working directory parent is obsolete! (e308b18e59ab)
+  (use 'hg evolve' to update to its successor: 20885f9c4458)
   $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True
-  rebasing 22:136e58088ce2 "added z"
+  rebasing 22:e308b18e59ab "added z"
   2 new content-divergent changesets
   $ echo bar > z
   $ hg amend
 
   $ hg glog
-  @  25:7e87b40e3aa8 added z
+  @  25:85cb29df3b9e added z
   |   () [bar] draft
-  | *  23:f4c3594c72e7 added z
+  | *  23:20885f9c4458 added z
   | |   () [default] draft
-  o |  21:26dd4974d99f added y
+  o |  21:a1a5f649aad4 added y
   | |   () [bar] draft
-  o |  15:3c4c7420a968 added foo to x
+  o |  15:60f40a789d85 added foo to x
   | |   () [bar] draft
-  o |  10:25cb1649b463 added d
+  o |  10:44c908a29dde added d
   | |   () [default] draft
-  o |  9:81ead2f9fc61 added c
+  o |  9:905d3f000de6 added c
   |/    () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -486,7 +486,7 @@
   merge:[23] added z
   with: [25] added z
   base: [22] added z
-  rebasing "divergent" content-divergent changeset f4c3594c72e7 on 26dd4974d99f
+  rebasing "divergent" content-divergent changeset 20885f9c4458 on a1a5f649aad4
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -494,16 +494,16 @@
   [240]
 
   $ hg diff
-  diff -r 26dd4974d99f y
+  diff -r a1a5f649aad4 y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< destination: 26dd4974d99f bar - test: added y
+  +<<<<<<< destination: a1a5f649aad4 bar - test: added y
    watbar
   +=======
   +foo
-  +>>>>>>> evolving:    f4c3594c72e7 - test: added z
-  diff -r 26dd4974d99f z
+  +>>>>>>> evolving:    20885f9c4458 - test: added z
+  diff -r a1a5f649aad4 z
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/z	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -515,7 +515,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  evolving 23:f4c3594c72e7 "added z"
+  evolving 23:20885f9c4458 "added z"
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -524,16 +524,16 @@
   [240]
 
   $ hg diff
-  diff -r 1d81f53f31a4 y
+  diff -r 3ad61e93b7b0 y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 1d81f53f31a4 - test: added z
+  +<<<<<<< local: 3ad61e93b7b0 - test: added z
    foo
   +=======
   +watbar
-  +>>>>>>> other: 7e87b40e3aa8 bar - test: added z
-  diff -r 1d81f53f31a4 z
+  +>>>>>>> other: 85cb29df3b9e bar - test: added z
+  diff -r 3ad61e93b7b0 z
   --- a/z	Thu Jan 01 00:00:00 1970 +0000
   +++ b/z	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -545,20 +545,20 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  working directory is now at eae98f1d3ae7
+  working directory is now at 9fe0112b059e
 
   $ hg glog
-  @  27:eae98f1d3ae7 added z
+  @  27:9fe0112b059e added z
   |   () [bar] draft
-  o  21:26dd4974d99f added y
+  o  21:a1a5f649aad4 added y
   |   () [bar] draft
-  o  15:3c4c7420a968 added foo to x
+  o  15:60f40a789d85 added foo to x
   |   () [bar] draft
-  o  10:25cb1649b463 added d
+  o  10:44c908a29dde added d
   |   () [default] draft
-  o  9:81ead2f9fc61 added c
+  o  9:905d3f000de6 added c
   |   () [default] draft
-  o  8:c5862ade0278 added b
+  o  8:bd76a775c527 added b
   |   () [default] draft
   | o  1:c7586e2a9264 added a
   |/    () [default] draft
@@ -571,17 +571,17 @@
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Branch bar
-  # Node ID eae98f1d3ae723ed9f81e99a2eb0855305a6f5c3
-  # Parent  26dd4974d99f30b9c9b259e22254b29474155d45
+  # Node ID 9fe0112b059ea3e9b1213e4f07839b957125ffca
+  # Parent  a1a5f649aad404acfddaa979465e96581c2ce0fb
   added z
   
-  diff -r 26dd4974d99f -r eae98f1d3ae7 y
+  diff -r a1a5f649aad4 -r 9fe0112b059e y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -watbar
   +foo
-  diff -r 26dd4974d99f -r eae98f1d3ae7 z
+  diff -r a1a5f649aad4 -r 9fe0112b059e z
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/z	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -590,46 +590,46 @@
   $ hg debugobsolete
   b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  2ec52f302b0f0ef30979124e92f1d9f2a26cedf8 c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  da4b96f4a8d610a85b225583138f681d67e275dd c5862ade02783a99f46082f4f0483c449fc4c3f2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  ca1b80f7960aae2306287bab52b4090c59af8c29 81ead2f9fc6156de69d12b7b5df71c34ab8b9c10 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c41c793e0ef1ddb463e85ea9491e377d01127ba2 25cb1649b46389f8e6e77c3796f01b37996b8fcd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 91939f44a1fe6d865ec791122014971dfff75129 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
-  f220d694b3a605e236b4b34ef97d3cc6959efb89 7af6be6736c0aebd226820373190e636fe9f16e9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  91939f44a1fe6d865ec791122014971dfff75129 c38f731f5ae01e417ceeea09f046febf4536d356 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  c38f731f5ae01e417ceeea09f046febf4536d356 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  7af6be6736c0aebd226820373190e636fe9f16e9 3c4c7420a968a3f76d61fa16c3af9abe115f07b6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
-  d84c9e99d55bfa499ab77dabd1fb3035e8f14ba9 98cd38d203030c04c89650c7280a6a71ae2f748c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  d84c9e99d55bfa499ab77dabd1fb3035e8f14ba9 6c3124aac43f4c0e64155b93ea60e0e10abd6ba1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
-  6c3124aac43f4c0e64155b93ea60e0e10abd6ba1 ec9ec45c397e15dfd9f25a91b6ffa1e17f9b9471 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  98cd38d203030c04c89650c7280a6a71ae2f748c 5ddc0bec0e2650fb56e3b5d24f7c7c3a61401fbe 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  5ddc0bec0e2650fb56e3b5d24f7c7c3a61401fbe 26dd4974d99f30b9c9b259e22254b29474155d45 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
-  ec9ec45c397e15dfd9f25a91b6ffa1e17f9b9471 26dd4974d99f30b9c9b259e22254b29474155d45 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  136e58088ce2a46749c73256b02608ca9be0fe09 f4c3594c72e7140404222d25e8827292e5d1a728 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  136e58088ce2a46749c73256b02608ca9be0fe09 da49edc1732932755e2c42d91b6883e6616ff40b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
-  da49edc1732932755e2c42d91b6883e6616ff40b 7e87b40e3aa8d28f0ba07c1cec4f562e57ba7c12 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  f4c3594c72e7140404222d25e8827292e5d1a728 1d81f53f31a466dd36278a04c919fb50a37f04bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
-  1d81f53f31a466dd36278a04c919fb50a37f04bd eae98f1d3ae723ed9f81e99a2eb0855305a6f5c3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
-  7e87b40e3aa8d28f0ba07c1cec4f562e57ba7c12 eae98f1d3ae723ed9f81e99a2eb0855305a6f5c3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  7ed0642d644bb9ad93d252dd9ffe7b4729febe48 df708ef51071b9b7932664cb88742483ffa6c0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  df708ef51071b9b7932664cb88742483ffa6c0af bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  da4b96f4a8d610a85b225583138f681d67e275dd bd76a775c52744611afa76b4980e0b46a7a105f5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  ca1b80f7960aae2306287bab52b4090c59af8c29 905d3f000de6ac0cdca8ed4bd222bf08ddb4b6d4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  c41c793e0ef1ddb463e85ea9491e377d01127ba2 44c908a29dde4b2a7fd1fa5714177b99a2423bbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d f9c46439290cf371c88424caaefc92398d808666 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'}
+  2eea3a452f0362f367aa8a45ffc2ebec52971c3d 03d7f147ff4243d7ac83eba7047ab8847da35c91 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  f9c46439290cf371c88424caaefc92398d808666 45cdf781a3eac63e762b68047e0beee60a47a805 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  45cdf781a3eac63e762b68047e0beee60a47a805 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  03d7f147ff4243d7ac83eba7047ab8847da35c91 60f40a789d85a42549e1e10c27779cfb5d5e1e1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
+  6cba24390b749067bef92c44e0288e6f554bfb37 347339f712becdde80c9ad13d22a497db6086d90 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  6cba24390b749067bef92c44e0288e6f554bfb37 24f8adc447ef80b160e63ae48688e98cb737166f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+  24f8adc447ef80b160e63ae48688e98cb737166f 7734a6171413c2df9c39102accf4bc21cbc5bd9a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  347339f712becdde80c9ad13d22a497db6086d90 6f720dea6f607e618f51c0cf1b07f8415de5e23e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  6f720dea6f607e618f51c0cf1b07f8415de5e23e a1a5f649aad404acfddaa979465e96581c2ce0fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+  7734a6171413c2df9c39102accf4bc21cbc5bd9a a1a5f649aad404acfddaa979465e96581c2ce0fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  e308b18e59abf67245f1d9e19d26578bab7cd9c1 20885f9c44581ef505edf72a1de7c939ed3eb794 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  e308b18e59abf67245f1d9e19d26578bab7cd9c1 29d63ec6339e534af5eff2c8f3f47cfac2f2c863 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'}
+  29d63ec6339e534af5eff2c8f3f47cfac2f2c863 85cb29df3b9e7c6d08ffa7d546639c5360acc92d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  20885f9c44581ef505edf72a1de7c939ed3eb794 3ad61e93b7b0eb94c634e61fe0570cc016cf2d1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
+  3ad61e93b7b0eb94c634e61fe0570cc016cf2d1b 9fe0112b059ea3e9b1213e4f07839b957125ffca 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
+  85cb29df3b9e7c6d08ffa7d546639c5360acc92d 9fe0112b059ea3e9b1213e4f07839b957125ffca 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog --all
-  @    eae98f1d3ae7 (27) added z
-  |\     rewritten(branch, content) from 1d81f53f31a4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |    amended(content) from 7e87b40e3aa8 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @    9fe0112b059e (27) added z
+  |\     rewritten(branch, content) from 3ad61e93b7b0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from 85cb29df3b9e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  1d81f53f31a4 (26) added z
-  | |    rewritten(parent, content) from f4c3594c72e7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  x |  3ad61e93b7b0 (26) added z
+  | |    rewritten(parent, content) from 20885f9c4458 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  7e87b40e3aa8 (25) added z
-  | |    amended(content) from da49edc17329 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  85cb29df3b9e (25) added z
+  | |    amended(content) from 29d63ec6339e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  da49edc17329 (24) added z
-  | |    rewritten(branch, parent) from 136e58088ce2 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  x |  20885f9c4458 (23) added z
+  | |    amended(content) from e308b18e59ab using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  f4c3594c72e7 (23) added z
-  |/     amended(content) from 136e58088ce2 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  29d63ec6339e (24) added z
+  |/     rewritten(branch, parent) from e308b18e59ab using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  136e58088ce2 (22) added z
+  x  e308b18e59ab (22) added z
   
 
   $ cd ..
@@ -693,7 +693,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   1 new orphan changesets
   $ hg glog
-  o  7:cc3d0c6117c7 divergent
+  o  7:412e351c2892 divergent
   |   () [default] draft
   | *  5:88473f9137d1 child
   | |   () [default] draft
@@ -708,9 +708,9 @@
   move:[5] child
   atop:[7] divergent
   $ hg glog
-  o  8:916b4ec3b91f child
+  o  8:b361c3801668 child
   |   () [default] draft
-  o  7:cc3d0c6117c7 divergent
+  o  7:412e351c2892 divergent
   |   () [default] draft
   o  1:33c576d20069 upstream
   |   () [default] draft
@@ -719,22 +719,22 @@
   $ hg debugobsolete
   898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
   898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
-  befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
-  bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
-  88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  4cc21313ecee97ce33265514a0596a192bfa6b3f 76fca1cf64e34efb00748a6cc50d2d0b411e3039 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
+  befae61385695f1ae4b78b030ad91075b2b523ef 412e351c28921f27c0f3ac678e209a9e99d9b76c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
+  76fca1cf64e34efb00748a6cc50d2d0b411e3039 412e351c28921f27c0f3ac678e209a9e99d9b76c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+  88473f9137d12e90055d30bbb9b78dd786520870 b361c3801668c8ba867a32ecc2a38cfdfb582a7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog -r 'desc("divergent")' --all
-  o    cc3d0c6117c7 (7) divergent
-  |\     amended(content) from befae6138569 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |    rewritten from bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  o    412e351c2892 (7) divergent
+  |\     rewritten from 76fca1cf64e3 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) from befae6138569 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  befae6138569 (3) divergent
+  x |  76fca1cf64e3 (6) divergent
+  | |    rewritten(parent, content) from 4cc21313ecee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
+  | x  befae6138569 (3) divergent
   | |    rebased(parent) from 898ddd4443b3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  bf4fe3a3afeb (6) divergent
-  | |    rewritten(parent, content) from 4cc21313ecee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |
-  | x  4cc21313ecee (4) divergent
+  x |  4cc21313ecee (4) divergent
   |/     amended(content) from 898ddd4443b3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  898ddd4443b3 (2) divergent
--- a/tests/test-evolve-content-divergent-stack.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Oct 07 20:32:14 2022 -0400
@@ -478,31 +478,31 @@
   merge:[6] added b
   with: [11] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset d5f148423c16 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 6eb54b5af3fb on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset d5f148423c16 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 6eb54b5af3fb on 4c0b67f978c2
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[7] added c
   with: [12] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 80cec1b1c90f
-  rebasing "other" content-divergent changeset 8ed612937375 on 80cec1b1c90f
+  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on c2c8d7bb6505
+  rebasing "other" content-divergent changeset 8ed612937375 on c2c8d7bb6505
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [13] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset c72d2885eb51 on 7e370616fb2b
-  rebasing "other" content-divergent changeset d45f050514c2 on 7e370616fb2b
+  rebasing "divergent" content-divergent changeset c72d2885eb51 on 2d29aa40ef18
+  rebasing "other" content-divergent changeset d45f050514c2 on 2d29aa40ef18
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 7e67dfb7ee31
+  working directory is now at 4c0b67f978c2
 
   $ hg glog
-  o  24:469255caf534 added d
+  o  24:4a605b2a329e added d
   |   () [default] draft
-  o  21:7e370616fb2b added c
+  o  21:2d29aa40ef18 added c
   |   () [default] draft
-  o  18:80cec1b1c90f added b
+  o  18:c2c8d7bb6505 added b
   |   () [default] draft
-  @  15:7e67dfb7ee31 watbar to a
+  @  15:4c0b67f978c2 watbar to a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
@@ -514,7 +514,7 @@
 
   $ hg strip 14: --hidden
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/7e67dfb7ee31-ff5c6a6d-backup.hg
+  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-9e140417-backup.hg
   8 new content-divergent changesets
 
 Prepare repo to have merge conflicts
@@ -527,7 +527,7 @@
   rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   6 new orphan changesets
-  working directory is now at 7e67dfb7ee31
+  working directory is now at 4c0b67f978c2
   $ echo b_conflict > b
   $ hg amend -A
   adding b
@@ -537,7 +537,7 @@
   merge:[6] added b
   with: [11] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset d5f148423c16 on c758af982013
+  rebasing "divergent" content-divergent changeset d5f148423c16 on 6b129ddb2c87
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -550,7 +550,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 6:d5f148423c16 "added b"
-  rebasing "other" content-divergent changeset 6eb54b5af3fb on c758af982013
+  rebasing "other" content-divergent changeset 6eb54b5af3fb on 6b129ddb2c87
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -567,23 +567,23 @@
   merge:[7] added c
   with: [12] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on f3872aea30b5
-  rebasing "other" content-divergent changeset 8ed612937375 on f3872aea30b5
+  rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on e55b9e217879
+  rebasing "other" content-divergent changeset 8ed612937375 on e55b9e217879
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [13] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset c72d2885eb51 on 72d58e863d2a
-  rebasing "other" content-divergent changeset d45f050514c2 on 72d58e863d2a
+  rebasing "divergent" content-divergent changeset c72d2885eb51 on 0e1902cb9cef
+  rebasing "other" content-divergent changeset d45f050514c2 on 0e1902cb9cef
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg glog
-  o  25:1ec6ea2bd496 added d
+  o  25:375c5a89ec21 added d
   |   () [default] draft
-  o  22:72d58e863d2a added c
+  o  22:0e1902cb9cef added c
   |   () [default] draft
-  o  19:f3872aea30b5 added b
+  o  19:e55b9e217879 added b
   |   () [default] draft
-  @  16:c758af982013 watbar to a
+  @  16:6b129ddb2c87 watbar to a
   |   () [default] draft
   o  9:2228e3b74514 add newfile
   |   () [default] draft
@@ -594,7 +594,7 @@
 --------------------------------------------------------------
   $ hg strip 14: --hidden
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c758af982013-458a0e95-backup.hg
+  saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-25c1f036-backup.hg
   8 new content-divergent changesets
 
 Insert conflicting changes in between the stack of content-div csets
@@ -635,8 +635,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -736,8 +736,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -751,7 +751,7 @@
   stopped the interrupted evolve
   working directory is now at 509103439e5e
   $ hg log -G
-  o  changeset:   21:7e67dfb7ee31
+  o  changeset:   21:4c0b67f978c2
   |  tag:         tip
   |  parent:      9:2228e3b74514
   |  user:        test
@@ -799,7 +799,7 @@
   +---x  changeset:   10:c04ff147ef79
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten using evolve as 21:7e67dfb7ee31
+  | |    obsolete:    rewritten using evolve as 21:4c0b67f978c2
   | |    summary:     added a
   | |
   o |  changeset:   9:2228e3b74514
@@ -812,7 +812,7 @@
   |/   parent:      0:8fa14d15e168
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rebased using evolve as 21:7e67dfb7ee31
+  |    obsolete:    rebased using evolve as 21:4c0b67f978c2
   |    summary:     watbar to a
   |
   o  changeset:   0:8fa14d15e168
@@ -821,11 +821,11 @@
      summary:     added hgignore
   
   $ hg obslog -r 'desc("watbar to a")' --all
-  o    7e67dfb7ee31 (21) watbar to a
-  |\     rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  o    4c0b67f978c2 (21) watbar to a
+  |\     rewritten from b0d57620c872 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |    rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  186bdc2cdfa2 (20) watbar to a
+  x |  b0d57620c872 (20) watbar to a
   | |    rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  c04ff147ef79 (10) added a
@@ -857,8 +857,8 @@
   merge:[14] added b
   with: [17] added b
   base: [2] added b
-  rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31
-  rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31
+  rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
+  rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -874,16 +874,16 @@
   merge:[15] added c
   with: [18] added c
   base: [3] added c
-  rebasing "divergent" content-divergent changeset 48b0f803817a on ddfcba2aac91
-  rebasing "other" content-divergent changeset eaf34afe4df3 on ddfcba2aac91
+  rebasing "divergent" content-divergent changeset 48b0f803817a on 59338f08e6ef
+  rebasing "other" content-divergent changeset eaf34afe4df3 on 59338f08e6ef
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[16] added d
   with: [19] added d
   base: [4] added d
-  rebasing "divergent" content-divergent changeset 91c8ccb9c241 on bb396302d792
-  rebasing "other" content-divergent changeset c351be27f199 on bb396302d792
+  rebasing "divergent" content-divergent changeset 91c8ccb9c241 on ef321c27d145
+  rebasing "other" content-divergent changeset c351be27f199 on ef321c27d145
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at ddfcba2aac91
+  working directory is now at 59338f08e6ef
 
   $ hg evolve -l
 
@@ -1018,8 +1018,8 @@
   merge:[4] c
   with: [7] c
   base: [2] c
-  rebasing "divergent" content-divergent changeset fef59171875e on bfba946a2829
-  rebasing "other" content-divergent changeset ef4885dea3da on bfba946a2829
+  rebasing "divergent" content-divergent changeset fef59171875e on 24bad874a3c7
+  rebasing "other" content-divergent changeset ef4885dea3da on 24bad874a3c7
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Expected result:
@@ -1027,15 +1027,15 @@
 Changeset with description "c" only adds file "c" with content "c".
 
   $ hg glog -l2 -p
-  o  12:a5abd6c7f9d8 c
-  |   () [default] draftdiff -r bfba946a2829 -r a5abd6c7f9d8 c
+  o  12:8a66432f9036 c
+  |   () [default] draftdiff -r 24bad874a3c7 -r 8a66432f9036 c
   |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   |  @@ -0,0 +1,1 @@
   |  +c
   |
-  o  9:bfba946a2829 b
-  |   () [default] draftdiff -r 980f7dc84c29 -r bfba946a2829 b
+  o  9:24bad874a3c7 b
+  |   () [default] draftdiff -r 980f7dc84c29 -r 24bad874a3c7 b
   ~  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
      +++ b/b	Thu Jan 01 00:00:00 1970 +0000
      @@ -0,0 +1,1 @@
@@ -1121,16 +1121,16 @@
   merge:[5] added bar and car
   with: [9] added bar and car
   base: [2] added bar and car
-  rebasing "divergent" content-divergent changeset f4ed107810a7 on 3e0693d8f69b
-  rebasing "other" content-divergent changeset 7dd5b9d42ef3 on 3e0693d8f69b
+  rebasing "divergent" content-divergent changeset f4ed107810a7 on eb084588f69b
+  rebasing "other" content-divergent changeset 7dd5b9d42ef3 on eb084588f69b
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 new orphan changesets
-  working directory is now at 3e0693d8f69b
+  working directory is now at eb084588f69b
 
   $ hg glog
-  o  15:5382795441b8 added bar and car
+  o  15:33947326df25 added bar and car
   |   () [default] draft
-  @  12:3e0693d8f69b added foo
+  @  12:eb084588f69b added foo
   |   () [default] draft
   | *  10:9a1f460df8b5 added dar
   | |   () [default] draft
--- a/tests/test-evolve-continue.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-continue.t	Fri Oct 07 20:32:14 2022 -0400
@@ -243,10 +243,10 @@
   move:[8] added c
   atop:[13] added b
   move:[11] added d
-  working directory is now at e74792b81a55
+  working directory is now at 0fb68c8390f6
 
   $ hg glog
-  @  15:e74792b81a55 added d
+  @  15:0fb68c8390f6 added d
   |   () draft
   o  14:7bf9d72ff3bf added c
   |   () draft
@@ -263,13 +263,13 @@
   $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
 
   $ hg glog
-  @  18:b0be59de2042 added h
+  @  18:1519cf722575 added h
   |   () draft
-  o  17:65a420e37a47 added g
+  o  17:04c32ddd9b44 added g
   |   () draft
-  o  16:e27c754278b4 added f
+  o  16:29139ab665e3 added f
   |   () draft
-  o  15:e74792b81a55 added d
+  o  15:0fb68c8390f6 added d
   |   () draft
   o  14:7bf9d72ff3bf added c
   |   () draft
@@ -292,13 +292,13 @@
   $ hg glog
   @  19:ebc872a542e5 added c
   |   () draft
-  | *  18:b0be59de2042 added h
+  | *  18:1519cf722575 added h
   | |   () draft orphan
-  | *  17:65a420e37a47 added g
+  | *  17:04c32ddd9b44 added g
   | |   () draft orphan
-  | *  16:e27c754278b4 added f
+  | *  16:29139ab665e3 added f
   | |   () draft orphan
-  | *  15:e74792b81a55 added d
+  | *  15:0fb68c8390f6 added d
   | |   () draft orphan
   | x  14:7bf9d72ff3bf added c
   |/    () draft
@@ -326,7 +326,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 16:e27c754278b4 "added f"
+  evolving 16:29139ab665e3 "added f"
   move:[17] added g
   atop:[21] added f
   move:[18] added h
@@ -343,19 +343,19 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 18:b0be59de2042 "added h"
-  working directory is now at 91c5e26a586a
+  evolving 18:1519cf722575 "added h"
+  working directory is now at 0eb2b6434bd7
 
 Make sure, confirmopt is respected while continue
 
   $ hg glog
-  @  23:91c5e26a586a added h
+  @  23:0eb2b6434bd7 added h
   |   () draft
-  o  22:e825e477b74b added g
+  o  22:d4c17c25a1c7 added g
   |   () draft
-  o  21:0a2fc6eeeb5c added f
+  o  21:602e4bd1e5aa added f
   |   () draft
-  o  20:f0c57a8fdffc added d
+  o  20:5cf56d246d18 added d
   |   () draft
   o  19:ebc872a542e5 added c
   |   () draft
@@ -395,20 +395,20 @@
   $ hg evolve --continue << EOF
   > y
   > EOF
-  evolving 22:e825e477b74b "added g"
+  evolving 22:d4c17c25a1c7 "added g"
   move:[23] added h
   atop:[25] added g
   perform evolve? [Ny] y
-  working directory is now at a590d5f50500
+  working directory is now at cc583f773dc4
 
   $ hg glog
-  @  26:a590d5f50500 added h
+  @  26:cc583f773dc4 added h
   |   () draft
-  o  25:e37fd94c4cdd added g
+  o  25:84772f0dfa79 added g
   |   () draft
-  o  24:93c25976d54c added f
+  o  24:d074fc123610 added f
   |   () draft
-  o  20:f0c57a8fdffc added d
+  o  20:5cf56d246d18 added d
   |   () draft
   o  19:ebc872a542e5 added c
   |   () draft
@@ -442,7 +442,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 25:e37fd94c4cdd "added g"
+  evolving 25:84772f0dfa79 "added g"
 
 Testing that interrupted evolve don't get confused about copies (issue5930):
 ----------------------------------------------------------------------------
--- a/tests/test-evolve-noupdate.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-noupdate.t	Fri Oct 07 20:32:14 2022 -0400
@@ -116,14 +116,14 @@
   atop:[8] added a
   move:[6] added c
   move:[7] added d
-  working directory is now at 12c720cb3782
+  working directory is now at 4a58b1d0c4f3
 
   $ hg glog
-  o  11:a74d9f22ba3f added d
+  o  11:43480a2dfd57 added d
   |   () draft
-  o  10:958f5155e8cd added c
+  o  10:ed864d50e6e4 added c
   |   () draft
-  @  9:12c720cb3782 added b
+  @  9:4a58b1d0c4f3 added b
   |   () draft
   o  8:3d41537b44ca added a
   |   () draft
--- a/tests/test-evolve-order.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-order.t	Fri Oct 07 20:32:14 2022 -0400
@@ -95,13 +95,13 @@
   atop:[11] asecond
   move:[6] add _c
   move:[7] add _d
-  working directory is now at 739f18ac1d03
+  working directory is now at 225d2cc5d3fc
   $ hg log -G
-  @  14:739f18ac1d03@default(draft) add _d
+  @  14:225d2cc5d3fc@default(draft) add _d
   |
-  o  13:e5960578d158@default(draft) add _c
+  o  13:0fc229278e4d@default(draft) add _c
   |
-  o  12:4ad33fa88946@default(draft) bprime
+  o  12:c3741b9eafae@default(draft) bprime
   |
   o  11:9a584314f3f3@default(draft) asecond
   |
@@ -124,21 +124,21 @@
   1 changesets pruned
   1 new orphan changesets
   $ hg log -G -r "desc(_d)::"
-  @  21:dcf786e878fd@default(draft) add c1second
+  @  21:a329855d0bc1@default(draft) add c1second
   |
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | *  20:072276ece1bf@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  19:f137acd06692@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | *  18:0a1d9b2ce733@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:e2874f41c56c@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  16:3247c33339fa@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  15:df322257c182@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -154,33 +154,33 @@
   1 changesets pruned
 
   $ hg log -G -r "desc(_d)::"
-  @  27:b253ff5b65d1@default(draft) add b3prime
+  @  27:ba4c348b6d5e@default(draft) add b3prime
   |
-  o  26:4acf61f11dfb@default(draft) add b1prime
+  o  26:8fe985f5d0aa@default(draft) add b1prime
   |
-  | *  25:594e1fbbd61f@default(draft) add b4_
+  | *  25:1d9ba2e75c93@default(draft) add b4_
   | |
-  | x  24:be27500cfc76@default(draft) add b3_
+  | x  24:aec6a9657b6c@default(draft) add b3_
   | |
-  | x  23:b54f77dc5831@default(draft) add b2_
+  | x  23:a69b58575918@default(draft) add b2_
   | |
-  | x  22:0e1eba27e9aa@default(draft) add b1_
+  | x  22:3564eb18e448@default(draft) add b1_
   |/
-  | o  21:dcf786e878fd@default(draft) add c1second
+  | o  21:a329855d0bc1@default(draft) add c1second
   |/
-  | *  20:507d52d715f6@default(draft) add c2prime
+  | *  20:072276ece1bf@default(draft) add c2prime
   | |
-  | x  19:c995cb124ddc@default(draft) add c1prime
+  | x  19:f137acd06692@default(draft) add c1prime
   |/
-  | *  18:d096a2437fd0@default(draft) add c4_
+  | *  18:0a1d9b2ce733@default(draft) add c4_
   | |
-  | *  17:cde95c6cba7a@default(draft) add c3_
+  | *  17:e2874f41c56c@default(draft) add c3_
   | |
-  | x  16:e0d9f7a099fe@default(draft) add c2_
+  | x  16:3247c33339fa@default(draft) add c2_
   | |
-  | x  15:43b7c338b1f8@default(draft) add c1_
+  | x  15:df322257c182@default(draft) add c1_
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -188,7 +188,7 @@
   $ echo "(desc(_d)::) - desc(c3_)"
   (desc(_d)::) - desc(c3_)
   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
-  skipping d096a2437fd0, consider including orphan ancestors
+  skipping 0a1d9b2ce733, consider including orphan ancestors
   move:[20] add c2prime
   atop:[21] add c1second
   move:[25] add b4_
@@ -199,23 +199,23 @@
   move:[17] add c3_
   atop:[28] add c2prime
   move:[18] add c4_
-  working directory is now at 35e7b797ace5
+  working directory is now at 4ee8feb52325
   $ hg log -G -r "desc(_d)::"
-  @  31:35e7b797ace5@default(draft) add c4_
+  @  31:4ee8feb52325@default(draft) add c4_
   |
-  o  30:0b9488394e89@default(draft) add c3_
+  o  30:08a530ce67e1@default(draft) add c3_
   |
-  | o  29:ea93190a9cd1@default(draft) add b4_
+  | o  29:4897c8ed7645@default(draft) add b4_
   | |
-  o |  28:881b9c092e53@default(draft) add c2prime
+  o |  28:3abc7618dd5f@default(draft) add c2prime
   | |
-  | o  27:b253ff5b65d1@default(draft) add b3prime
+  | o  27:ba4c348b6d5e@default(draft) add b3prime
   | |
-  | o  26:4acf61f11dfb@default(draft) add b1prime
+  | o  26:8fe985f5d0aa@default(draft) add b1prime
   | |
-  o |  21:dcf786e878fd@default(draft) add c1second
+  o |  21:a329855d0bc1@default(draft) add c1second
   |/
-  o  14:739f18ac1d03@default(draft) add _d
+  o  14:225d2cc5d3fc@default(draft) add _d
   |
   ~
 
@@ -244,4 +244,4 @@
   $ hg evolve --rev "orphan()"
   move:[29] add b4_
   atop:[34] b3second
-  skipping 0b9488394e89: divergent rewriting. can't choose destination
+  skipping 08a530ce67e1: divergent rewriting. can't choose destination
--- a/tests/test-evolve-phase-divergence.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-phase-divergence.t	Fri Oct 07 20:32:14 2022 -0400
@@ -756,21 +756,21 @@
   recreate:[14] y to y and foobar to foo
   atop:[12] y to y and foobar to foo
   rebasing to destination parent: 2352021b3785
-  committed as 8c2bb6fb44e9
-  working directory is now at 8c2bb6fb44e9
+  committed as ec66af49a1a6
+  working directory is now at ec66af49a1a6
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
+  # Node ID ec66af49a1a643ef308fe11697c59c4920d2bd9e
   # Parent  dc88f5aa9bc90a6418899d267d9524205dfb429b
   phase-divergent update to dc88f5aa9bc9:
   
   y to y and foobar to foo
   
-  diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y
+  diff -r dc88f5aa9bc9 -r ec66af49a1a6 y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -778,7 +778,7 @@
   +foo
 
   $ hg glog
-  @  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+  @  16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
   |   () draft
   o  12:dc88f5aa9bc9 y to y and foobar to foo
   |   () public
@@ -806,7 +806,7 @@
   $ echo l > l
   $ hg ci -Aqm "added l to l"
   $ hg rebase -r . -d .^^^^
-  rebasing 17:f3794e5a91dc tip "added l to l"
+  rebasing 17:c7c3e834e653 tip "added l to l"
   $ echo kl > l
   $ echo foo > x
   $ hg add x
@@ -824,21 +824,21 @@
   b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
   211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  13015a180eee523ba9950f18683762a77f560f3d 7687d2968b3e2697f955beac2da24ee879950cb9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
-  f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  13015a180eee523ba9950f18683762a77f560f3d 7c9c658a311a5194f4826f91ae667b151263d192 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  7c9c658a311a5194f4826f91ae667b151263d192 ec66af49a1a643ef308fe11697c59c4920d2bd9e 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
+  c7c3e834e6538706672e2b5387a27efda6e0f00f 5c0ff97e7b93a7510a08eaf8ae3821448255963d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  5c0ff97e7b93a7510a08eaf8ae3821448255963d 4c2ba1e0fc47842138814c7e5dc64392bdf2d70e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   $ hg obslog -r .
-  @  5fd38c0de46e (19) added l to l
-  |    amended(content) from 2bfd56949cf0 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  @  4c2ba1e0fc47 (19) added l to l
+  |    amended(content) from 5c0ff97e7b93 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  2bfd56949cf0 (18) added l to l
-  |    rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  x  5c0ff97e7b93 (18) added l to l
+  |    rebased(parent) from c7c3e834e653 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  f3794e5a91dc (17) added l to l
+  x  c7c3e834e653 (17) added l to l
   
 
-  $ hg phase -r f3794e5a91dc --public --hidden
+  $ hg phase -r c7c3e834e653 --public --hidden
   1 new phase-divergent changesets
 
 Resolution using `hg evolve --phase-divergent`
@@ -847,7 +847,7 @@
   $ hg evolve --phase-divergent --update
   recreate:[19] added l to l
   atop:[17] added l to l
-  rebasing to destination parent: 8c2bb6fb44e9
+  rebasing to destination parent: ec66af49a1a6
   merging x
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -855,20 +855,20 @@
   [240]
 
   $ hg diff
-  diff -r 8c2bb6fb44e9 l
+  diff -r ec66af49a1a6 l
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/l	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +kl
-  diff -r 8c2bb6fb44e9 x
+  diff -r ec66af49a1a6 x
   --- a/x	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
+  +<<<<<<< destination: ec66af49a1a6 - test: phase-divergent update to dc88f5aa9...
    x
   +=======
   +foo
-  +>>>>>>> evolving:    5fd38c0de46e - test: added l to l
+  +>>>>>>> evolving:    4c2ba1e0fc47 - test: added l to l
 
   $ echo foo > x
 
@@ -877,16 +877,16 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  evolving 19:5fd38c0de46e "added l to l"
-  committed as c2aa021d3c99
-  working directory is now at c2aa021d3c99
+  evolving 19:4c2ba1e0fc47 "added l to l"
+  committed as 4a3e0e3f88ca
+  working directory is now at 4a3e0e3f88ca
 
   $ hg glog
-  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () draft
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
-  o  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+  o  16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
   |   () public
   o  12:dc88f5aa9bc9 y to y and foobar to foo
   |   () public
@@ -910,19 +910,19 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID c2aa021d3c99453c0b1b646fb7e9325b151780df
-  # Parent  f3794e5a91dc1d4d36fee5c423386b19433a1f48
-  phase-divergent update to f3794e5a91dc:
+  # Node ID 4a3e0e3f88ca7c24f3b9f54abfbb49a314fe4c0b
+  # Parent  c7c3e834e6538706672e2b5387a27efda6e0f00f
+  phase-divergent update to c7c3e834e653:
   
   added l to l
   
-  diff -r f3794e5a91dc -r c2aa021d3c99 l
+  diff -r c7c3e834e653 -r 4a3e0e3f88ca l
   --- a/l	Thu Jan 01 00:00:00 1970 +0000
   +++ b/l	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -l
   +kl
-  diff -r f3794e5a91dc -r c2aa021d3c99 x
+  diff -r c7c3e834e653 -r 4a3e0e3f88ca x
   --- a/x	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -933,7 +933,7 @@
 ------------------------------------------------------------------------
 
   $ hg glog -r .
-  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () draft
   ~
   $ echo f > f
@@ -947,44 +947,44 @@
 
   $ hg evolve --list
 
-  $ hg phase -r 3bb2b4083933 --public --hidden
+  $ hg phase -r 898734e41932 --public --hidden
   1 new phase-divergent changesets
 
-  $ hg glog -r f3794e5a91dc::
-  @  24:39a4f9562a25 added f
+  $ hg glog -r c7c3e834e653::
+  @  24:5dfcf4a7c095 added f
   |   () draft
-  | o  23:3bb2b4083933 added g
+  | o  23:898734e41932 added g
   | |   () public
-  | o  22:12f787829d43 added f
+  | o  22:54c60ee8ecb8 added f
   |/    () public
-  o  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
+  o  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () public
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
   ~
 
   $ hg evolve --list
-  39a4f9562a25: added f
-    phase-divergent: 12f787829d43 (immutable precursor)
-    phase-divergent: 3bb2b4083933 (immutable precursor)
+  5dfcf4a7c095: added f
+    phase-divergent: 54c60ee8ecb8 (immutable precursor)
+    phase-divergent: 898734e41932 (immutable precursor)
   
 Resolving phase divergence using `hg evolve`
 
   $ hg evolve --phase-divergent --all
   recreate:[24] added f
   atop:[23] added g
-  rebasing to destination parent: 12f787829d43
+  rebasing to destination parent: 54c60ee8ecb8
   no changes to commit
-  working directory is now at c2aa021d3c99
+  working directory is now at 4a3e0e3f88ca
 
-  $ hg glog -r f3794e5a91dc::
-  o  23:3bb2b4083933 added g
+  $ hg glog -r c7c3e834e653::
+  o  23:898734e41932 added g
   |   () public
-  o  22:12f787829d43 added f
+  o  22:54c60ee8ecb8 added f
   |   () public
-  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () public
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
   ~
 
@@ -1315,13 +1315,13 @@
   recreate:[4] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
-  committed as 88b0dae5369a
-  working directory is now at 88b0dae5369a
+  committed as 0f21d47fe960
+  working directory is now at 0f21d47fe960
 
   $ hg glog --hidden
-  @  7:88b0dae5369a phase-divergent update to a51bce62c219:
+  @  7:0f21d47fe960 phase-divergent update to a51bce62c219:
   |   () draft
-  | x  6:98dad8812511 added n
+  | x  6:302a3ecef922 added n
   | |   () draft
   +---o  5:86419909e017 phase-divergent update to a51bce62c219:
   | |     () draft
@@ -1340,25 +1340,25 @@
   a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
   e1154ec0206ac05c3765f7bd1337e3b96db2974f 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
-  52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
+  52ca78bb98c71222f8afae28d48ae6cfd44a60c9 302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0f21d47fe96059e134fd230d6d1623ff1d541963 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
   $ hg obslog -r a51bce62c219 --all
-  o  86419909e017 (5) phase-divergent update to a51bce62c219:
-  |    rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  @  0f21d47fe960 (7) phase-divergent update to a51bce62c219:
+  |    rewritten(description, parent, content) from 302a3ecef922 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  | @  88b0dae5369a (7) phase-divergent update to a51bce62c219:
-  | |    rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | o  86419909e017 (5) phase-divergent update to a51bce62c219:
+  | |    rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  x |  4f25cd9cd2bf (2) added m
+  x |  302a3ecef922 (6) added n
+  | |    rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
+  | x  4f25cd9cd2bf (2) added m
   | |    split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  98dad8812511 (6) added n
-  | |    rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |
-  | x  52ca78bb98c7 (4) added n
+  x |  52ca78bb98c7 (4) added n
   | |    amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  e1154ec0206a (3) added n
+  x |  e1154ec0206a (3) added n
   |/     split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   o  a51bce62c219 (1) added m and n
@@ -1383,23 +1383,23 @@
   -n
 
 XXX: not sure this is correct
-  $ hg exp 88b0dae5369a
+  $ hg exp 0f21d47fe960
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7
+  # Node ID 0f21d47fe96059e134fd230d6d1623ff1d541963
   # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
   phase-divergent update to a51bce62c219:
   
   added n
   
-  diff -r a51bce62c219 -r 88b0dae5369a m
+  diff -r a51bce62c219 -r 0f21d47fe960 m
   --- a/m	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -m
-  diff -r a51bce62c219 -r 88b0dae5369a n
+  diff -r a51bce62c219 -r 0f21d47fe960 n
   --- a/n	Thu Jan 01 00:00:00 1970 +0000
   +++ b/n	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Oct 07 20:32:14 2022 -0400
@@ -137,14 +137,14 @@
   base: [2] added c
   rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  committed as 0941937e8302
-  working directory is now at 0941937e8302
+  committed as a3019c73de83
+  working directory is now at a3019c73de83
 
   $ hg glog -p
-  @  8:0941937e8302 phase-divergent update to c0d7ee6604ea:
+  @  8:a3019c73de83 phase-divergent update to c0d7ee6604ea:
   |   draft
   |
-  |  diff -r c0d7ee6604ea -r 0941937e8302 c
+  |  diff -r c0d7ee6604ea -r a3019c73de83 c
   |  --- a/c	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   |  @@ -1,1 +1,2 @@
--- a/tests/test-evolve-topic.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve-topic.t	Fri Oct 07 20:32:14 2022 -0400
@@ -128,9 +128,9 @@
   move:[s3] add eee
   atop:[s2] add ddd
   move:[s4] add fff
-  working directory is now at 070c5573d8f9
+  working directory is now at ad43ddbeead9
   $ hg log -G
-  @  13 - {foo} 070c5573d8f9 add fff (draft)
+  @  13 - {foo} ad43ddbeead9 add fff (draft)
   |
   o  12 - {foo} 42b49017ff90 add eee (draft)
   |
@@ -166,17 +166,17 @@
   move:[7] add hhh
   move:[8] add iii
   move:[9] add jjj
-  working directory is now at 9bf430c106b7
+  working directory is now at fed0f67a2171
   $ hg log -G
-  @  17 - {bar} 9bf430c106b7 add jjj (draft)
+  @  17 - {bar} fed0f67a2171 add jjj (draft)
   |
-  o  16 - {bar} d2dc89c57700 add iii (draft)
+  o  16 - {bar} 94e899639b23 add iii (draft)
   |
-  o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  o  15 - {bar} 55e5cd2b6cd6 add hhh (draft)
   |
-  o  14 - {bar} 16d6f664b17c add ggg (draft)
+  o  14 - {bar} 56107a7ddeaf add ggg (draft)
   |
-  o  13 - {foo} 070c5573d8f9 add fff (draft)
+  o  13 - {foo} ad43ddbeead9 add fff (draft)
   |
   o  12 - {foo} 42b49017ff90 add eee (draft)
   |
@@ -227,15 +227,15 @@
 Testing when instability is involved
 
   $ hg log -G
-  o  17 - {bar} 9bf430c106b7 add jjj (draft)
+  o  17 - {bar} fed0f67a2171 add jjj (draft)
   |
-  o  16 - {bar} d2dc89c57700 add iii (draft)
+  o  16 - {bar} 94e899639b23 add iii (draft)
   |
-  o  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  o  15 - {bar} 55e5cd2b6cd6 add hhh (draft)
   |
-  o  14 - {bar} 16d6f664b17c add ggg (draft)
+  o  14 - {bar} 56107a7ddeaf add ggg (draft)
   |
-  o  13 - {foo} 070c5573d8f9 add fff (draft)
+  o  13 - {foo} ad43ddbeead9 add fff (draft)
   |
   @  12 - {foo} 42b49017ff90 add eee (draft)
   |
@@ -247,12 +247,12 @@
   |
   o  0 - {} 199cc73e9a0b add aaa (draft)
   
-  $ hg topic -r 070c5573d8f9 bar
+  $ hg topic -r ad43ddbeead9 bar
   4 new orphan changesets
   changed topic on 1 changesets to "bar"
   $ hg log -r 18 -T '{rev}: {join(extras, " ")}\n'
-  18: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=bar (re)
-  $ hg up 16d6f664b17c
+  18: _rewrite_noise=[0-9a-f]+ branch=default rebase_source=[0-9a-f]+ topic=bar (re)
+  $ hg up 56107a7ddeaf
   switching to topic bar
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -274,17 +274,17 @@
 ------------------------------------------------------------------------------
 
   $ hg log --graph
-  @  18 - {bar} c80027c7cda1 add fff (draft)
+  @  18 - {bar} 8dde0971132d add fff (draft)
   |
-  | *  17 - {bar} 9bf430c106b7 add jjj (draft)
+  | *  17 - {bar} fed0f67a2171 add jjj (draft)
   | |
-  | *  16 - {bar} d2dc89c57700 add iii (draft)
+  | *  16 - {bar} 94e899639b23 add iii (draft)
   | |
-  | *  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  | *  15 - {bar} 55e5cd2b6cd6 add hhh (draft)
   | |
-  | *  14 - {bar} 16d6f664b17c add ggg (draft)
+  | *  14 - {bar} 56107a7ddeaf add ggg (draft)
   | |
-  | x  13 - {foo} 070c5573d8f9 add fff (draft)
+  | x  13 - {foo} ad43ddbeead9 add fff (draft)
   |/
   o  12 - {foo} 42b49017ff90 add eee (draft)
   |
@@ -303,24 +303,24 @@
 
 When the current topic, obsoleted changesets topic and successor topic are same
 
-  $ hg up 20bc4d02aa62
+  $ hg up 55e5cd2b6cd6
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foobar >> hhh
   $ hg amend
-  $ hg up 20bc4d02aa62
+  $ hg up 55e5cd2b6cd6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete! (20bc4d02aa62)
-  (use 'hg evolve' to update to its successor: d834582d9ee3)
+  working directory parent is obsolete! (55e5cd2b6cd6)
+  (use 'hg evolve' to update to its successor: 604c23b08613)
   $ hg log -Gr 14::
-  *  19 - {bar} d834582d9ee3 add hhh (draft)
+  *  19 - {bar} 604c23b08613 add hhh (draft)
   |
-  | *  17 - {bar} 9bf430c106b7 add jjj (draft)
+  | *  17 - {bar} fed0f67a2171 add jjj (draft)
   | |
-  | *  16 - {bar} d2dc89c57700 add iii (draft)
+  | *  16 - {bar} 94e899639b23 add iii (draft)
   | |
-  | @  15 - {bar} 20bc4d02aa62 add hhh (draft)
+  | @  15 - {bar} 55e5cd2b6cd6 add hhh (draft)
   |/
-  *  14 - {bar} 16d6f664b17c add ggg (draft)
+  *  14 - {bar} 56107a7ddeaf add ggg (draft)
   |
   ~
 
@@ -331,33 +331,33 @@
 When the current topic and successors topic are same, but obsolete cset has
 different topic
 
-  $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
-  rebasing 16:d2dc89c57700 bar "add iii"
+  $ hg rebase -s 94e899639b23 -d 604c23b08613 --config extensions.rebase=
+  rebasing 16:94e899639b23 bar "add iii"
   1 new orphan changesets
-  rebasing 17:9bf430c106b7 bar "add jjj"
+  rebasing 17:fed0f67a2171 bar "add jjj"
   1 new orphan changesets
   $ hg log -Gr 42b49017ff90::
-  *  21 - {bar} 7542e76aba2c add jjj (draft)
+  *  21 - {bar} 573bbc059289 add jjj (draft)
   |
-  *  20 - {bar} 7858bd7e9906 add iii (draft)
+  *  20 - {bar} 8e94e3065186 add iii (draft)
   |
-  *  19 - {bar} d834582d9ee3 add hhh (draft)
+  *  19 - {bar} 604c23b08613 add hhh (draft)
   |
-  | o  18 - {bar} c80027c7cda1 add fff (draft)
+  | o  18 - {bar} 8dde0971132d add fff (draft)
   | |
-  @ |  14 - {bar} 16d6f664b17c add ggg (draft)
+  @ |  14 - {bar} 56107a7ddeaf add ggg (draft)
   | |
-  x |  13 - {foo} 070c5573d8f9 add fff (draft)
+  x |  13 - {foo} ad43ddbeead9 add fff (draft)
   |/
   o  12 - {foo} 42b49017ff90 add eee (draft)
   |
   ~
 
-  $ hg up 070c5573d8f9
+  $ hg up ad43ddbeead9
   switching to topic foo
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory parent is obsolete! (070c5573d8f9)
-  (use 'hg evolve' to update to its successor: c80027c7cda1)
+  working directory parent is obsolete! (ad43ddbeead9)
+  (use 'hg evolve' to update to its successor: 8dde0971132d)
 
   $ hg topic bar
 
@@ -369,7 +369,7 @@
 When current topic and obsolete cset topic are same but successor has different
 one
 
-  $ hg up 070c5573d8f9
+  $ hg up ad43ddbeead9
   switching to topic foo
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg prev
@@ -392,17 +392,17 @@
   $ hg ci --amend
   4 new orphan changesets
   $ hg log -G
-  @  26 - {bar} 239dcab64bc0 add fff (draft)
+  @  26 - {bar} 235873f1950b add fff (draft)
   |
-  | *  25 - {bar} e49f8682fb23 add jjj (draft)
+  | *  25 - {bar} ed0b505ff189 add jjj (draft)
   | |
-  | *  24 - {bar} 318094e157e3 add iii (draft)
+  | *  24 - {bar} 50b1b9387d50 add iii (draft)
   | |
-  | *  23 - {bar} aa8b0df2da21 add hhh (draft)
+  | *  23 - {bar} 0d4bb3a72a5b add hhh (draft)
   | |
-  | *  22 - {bar} 310e9f9bceb1 add ggg (draft)
+  | *  22 - {bar} 548702c1d91c add ggg (draft)
   | |
-  | x  18 - {bar} c80027c7cda1 add fff (draft)
+  | x  18 - {bar} 8dde0971132d add fff (draft)
   |/
   o  12 - {foo} 42b49017ff90 add eee (draft)
   |
@@ -428,7 +428,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 23:aa8b0df2da21 "add hhh"
+  evolving 23:0d4bb3a72a5b "add hhh"
   move:[s4] add iii
   atop:[s3] add hhh
   move:[s5] add jjj
@@ -441,13 +441,13 @@
   switching to topic foo
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   updated to hidden changeset 6a6b7365c751
-  (hidden revision '6a6b7365c751' was rewritten as: 239dcab64bc0)
+  (hidden revision '6a6b7365c751' was rewritten as: 235873f1950b)
   working directory parent is obsolete! (6a6b7365c751)
-  (use 'hg evolve' to update to its successor: 239dcab64bc0)
+  (use 'hg evolve' to update to its successor: 235873f1950b)
 
 Evolve:
   $ hg evolve
   update:[26] add fff
   switching to topic bar
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 239dcab64bc0
+  working directory is now at 235873f1950b
--- a/tests/test-evolve.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-evolve.t	Fri Oct 07 20:32:14 2022 -0400
@@ -400,7 +400,7 @@
 
 phase change turning obsolete changeset public issues a phase divergence warning
 
-  $ hg phase --hidden --public 99833d22b0c6
+  $ hg phase --hidden --public 5c9c8d9c2e4e
   1 new phase-divergent changesets
 
 all solving phase-divergent
@@ -408,7 +408,7 @@
   $ glog
   @  6:47d52a103155@default(draft) another feature that rox
   |
-  | o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  | o  5:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
   |/
   o  4:ba0ec09b1bab@default(public) a nifty feature
   |
@@ -417,19 +417,19 @@
   $ hg evolve --any --traceback --phase-divergent
   recreate:[6] another feature that rox
   atop:[5] another feature (child of ba0ec09b1bab)
-  committed as aca219761afb
-  working directory is now at aca219761afb
+  committed as acecd63a9288
+  working directory is now at acecd63a9288
   $ glog
-  @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
+  @  7:acecd63a9288@default(draft) phase-divergent update to 5c9c8d9c2e4e:
   |
-  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  o  5:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
   |
   o  4:ba0ec09b1bab@default(public) a nifty feature
   |
   o  0:e55e0562ee93@default(public) base
   
-  $ hg diff --hidden -r aca219761afb -r 47d52a103155
-  $ hg diff -r aca219761afb^ -r aca219761afb
+  $ hg diff --hidden -r acecd63a9288 -r 47d52a103155
+  $ hg diff -r acecd63a9288^ -r acecd63a9288
   diff --git a/main-file-1 b/main-file-1
   --- a/main-file-1
   +++ b/main-file-1
@@ -443,7 +443,7 @@
   $ hg commit -m 'dansk 2!'
   $ sed -i'' -e s/Three/tre/ main-file-1
   $ hg commit -m 'dansk 3!'
-  $ hg update aca219761afb
+  $ hg update acecd63a9288
   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!'
@@ -475,17 +475,17 @@
   $ hg evolve -n --config 'command-templates.oneline-summary = custom {rev} {desc}'
   move:custom 8 dansk 2!
   atop:custom 10 dansk!
-  hg rebase -r 569625323d3e -d 9975c016fe7b
-  skipping 8163b3ed62c7, consider including orphan ancestors
+  hg rebase -r bdb9adf2959a -d 74d61108f94b
+  skipping 3db99d6b500c, consider including orphan ancestors
 
 command-templates.oneline-summary is respected when evolving/updating working copy
 
   $ hg co -q 7
-  working directory parent is obsolete! (aca219761afb)
+  working directory parent is obsolete! (acecd63a9288)
   $ hg evolve --no-all --config 'command-templates.oneline-summary = custom {rev} {desc}'
   update:custom 10 dansk!
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 9975c016fe7b
+  working directory is now at 74d61108f94b
 
   $ hg evolve --all --traceback
   move:[8] dansk 2!
@@ -872,11 +872,11 @@
   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
+  @  13:90308a3a84bd@default(draft) Folding with custom commit message
   |
-  o  10:9975c016fe7b@default(draft) dansk!
+  o  10:74d61108f94b@default(draft) dansk!
   |
-  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  o  5:5c9c8d9c2e4e@default(public) another feature (child of ba0ec09b1bab)
   |
   o  4:ba0ec09b1bab@default(public) a nifty feature
   |
@@ -891,9 +891,9 @@
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg qlog
-  14 - 8693d0f277b8 A longer
+  14 - c07a8bc54a51 A longer
                     commit message (draft)
-  5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
+  5 - 5c9c8d9c2e4e another feature (child of ba0ec09b1bab) (public)
   4 - ba0ec09b1bab a nifty feature (public)
   0 - e55e0562ee93 base (public)
 
@@ -1009,13 +1009,13 @@
   $ ls .hg/bookmarks*
   .hg/bookmarks
   $ glog
-  o  10:d952e93add6f@mybranch(draft) a2
+  o  10:f37ed7a60f43@mybranch(draft) a2
   |
   @  9:9f8b83c2e7f3@default(draft) a1__
   |
-  | *  8:777c26ca5e78@mybranch(draft) a3
+  | *  8:c7661e655801@mybranch(draft) a3
   | |
-  | x  7:eb07e22a0e63@mybranch(draft) a2
+  | x  7:5406c5cfee42@mybranch(draft) a2
   | |
   | x  6:faafc6cea0ba@default(draft) a1_
   |/
@@ -1024,7 +1024,7 @@
 
 Possibility to select what instability to solve first, asking for
 phase-divergent before content-divergent
-  $ hg revert -r d952e93add6f --all
+  $ hg revert -r f37ed7a60f43 --all
   reverting a
   $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
   o  10 [mybranch] a2
@@ -1042,7 +1042,7 @@
   $ echo "hello world" > newfile
   $ hg add newfile
   $ hg commit -m "add new file bumped" -o 10
-  $ hg phase --public --hidden d952e93add6f
+  $ hg phase --public --hidden f37ed7a60f43
   1 new phase-divergent changesets
   $ hg log -G
   @  11	: add new file bumped - test
@@ -1081,17 +1081,17 @@
   $ hg evolve -r "desc('add new file bumped')" --phase-divergent
   recreate:[11] add new file bumped
   atop:[10] a2
-  committed as a8bb31d4b7f2
-  working directory is now at a8bb31d4b7f2
+  committed as db294883bd68
+  working directory is now at db294883bd68
   $ hg evolve --any
   move:[8] a3
-  atop:[12] phase-divergent update to d952e93add6f:
+  atop:[12] phase-divergent update to f37ed7a60f43:
   $ glog
-  o  13:b88539ad24d7@default(draft) a3
+  o  13:0210bf7b6518@default(draft) a3
   |
-  @  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+  @  12:db294883bd68@default(draft) phase-divergent update to f37ed7a60f43:
   |
-  o  10:d952e93add6f@mybranch(public) a2
+  o  10:f37ed7a60f43@mybranch(public) a2
   |
   o  9:9f8b83c2e7f3@default(public) a1__
   |
@@ -1099,14 +1099,14 @@
   
 
 Check that we can resolve instabilities in a revset with more than one commit
-  $ hg up b88539ad24d7 -C
+  $ hg up 0210bf7b6518 -C
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit gg
-  $ hg up b88539ad24d7
+  $ hg up 0210bf7b6518
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit gh
   created new head
-  $ hg up b88539ad24d7
+  $ hg up 0210bf7b6518
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ printf "newline\nnewline\n" >> a
   $ hg log -G
@@ -1116,7 +1116,7 @@
   |/
   @  13	: a3 - test
   |
-  o  12	: phase-divergent update to d952e93add6f: - test
+  o  12	: phase-divergent update to f37ed7a60f43: - test
   |
   o  10	: a2 - test
   |
@@ -1127,17 +1127,17 @@
   $ hg amend
   2 new orphan changesets
   $ glog
-  @  16:0cf3707e8971@default(draft) a3
+  @  16:5478ae0ce2d9@default(draft) a3
   |
-  | *  15:daa1ff1c7fbd@default(draft) add gh
+  | *  15:fb5702c4d3e6@default(draft) add gh
   | |
-  | | *  14:484fb3cfa7f2@default(draft) add gg
+  | | *  14:148850890f43@default(draft) add gg
   | |/
-  | x  13:b88539ad24d7@default(draft) a3
+  | x  13:0210bf7b6518@default(draft) a3
   |/
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+  o  12:db294883bd68@default(draft) phase-divergent update to f37ed7a60f43:
   |
-  o  10:d952e93add6f@mybranch(public) a2
+  o  10:f37ed7a60f43@mybranch(public) a2
   |
   o  9:9f8b83c2e7f3@default(public) a1__
   |
@@ -1145,29 +1145,29 @@
   
 
 Evolving an empty revset should do nothing
-  $ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2"
+  $ hg evolve --rev "fb5702c4d3e6 and 148850890f43"
   set of specified revisions is empty
   [1]
 
-  $ hg evolve --rev "b88539ad24d7::" --phase-divergent
+  $ hg evolve --rev "0210bf7b6518::" --phase-divergent
   no phasedivergent changesets in specified revisions
   (do you want to use --orphan)
   [2]
-  $ hg evolve --rev "b88539ad24d7::" --orphan
+  $ hg evolve --rev "0210bf7b6518::" --orphan
   move:[14] add gg
   atop:[16] a3
   move:[15] add gh
   atop:[16] a3
   $ glog
-  o  18:0c049e4e5422@default(draft) add gh
+  o  18:5f8a4fc86068@default(draft) add gh
   |
-  | o  17:98e171e2f272@default(draft) add gg
+  | o  17:a38ac764661b@default(draft) add gg
   |/
-  @  16:0cf3707e8971@default(draft) a3
+  @  16:5478ae0ce2d9@default(draft) a3
   |
-  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+  o  12:db294883bd68@default(draft) phase-divergent update to f37ed7a60f43:
   |
-  o  10:d952e93add6f@mybranch(public) a2
+  o  10:f37ed7a60f43@mybranch(public) a2
   |
   o  9:9f8b83c2e7f3@default(public) a1__
   |
@@ -1204,19 +1204,19 @@
 
   $ hg --hidden up 14
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 484fb3cfa7f2
-  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
-  working directory parent is obsolete! (484fb3cfa7f2)
+  updated to hidden changeset 148850890f43
+  (hidden revision '148850890f43' was rewritten as: a38ac764661b)
+  working directory parent is obsolete! (148850890f43)
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolutioncommands=evolve
   > EOF
   $ hg --hidden up 15
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset daa1ff1c7fbd
-  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
-  working directory parent is obsolete! (daa1ff1c7fbd)
-  (use 'hg evolve' to update to its successor: 0c049e4e5422)
+  updated to hidden changeset fb5702c4d3e6
+  (hidden revision 'fb5702c4d3e6' was rewritten as: 5f8a4fc86068)
+  working directory parent is obsolete! (fb5702c4d3e6)
+  (use 'hg evolve' to update to its successor: 5f8a4fc86068)
 
 Restore all of the evolution features
 
@@ -1226,7 +1226,7 @@
   > EOF
 
 Check hg evolve --rev on singled out commit
-  $ hg up 98e171e2f272 -C
+  $ hg up a38ac764661b -C
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit j1
   $ mkcommit j2
@@ -1237,28 +1237,28 @@
   $ hg add j4
   $ hg amend
   2 new orphan changesets
-  $ glog -r "0cf3707e8971::"
-  @  22:274b6cd0c101@default(draft) add j1
+  $ glog -r "5478ae0ce2d9::"
+  @  22:cc75952078c6@default(draft) add j1
   |
-  | *  21:89e4f7e8feb5@default(draft) add j3
+  | *  21:677a629bd09c@default(draft) add j3
   | |
-  | *  20:4cd61236beca@default(draft) add j2
+  | *  20:0208ef487f3a@default(draft) add j2
   | |
-  | x  19:0fd8bfb02de4@default(draft) add j1
+  | x  19:30d3ac01aa58@default(draft) add j1
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  18:5f8a4fc86068@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  17:a38ac764661b@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@default(draft) a3
   |
   ~
 
-  $ hg evolve --rev 89e4f7e8feb5 --any
+  $ hg evolve --rev 677a629bd09c --any
   abort: cannot specify both "--rev" and "--any"
   [255]
-  $ hg evolve --rev 89e4f7e8feb5
-  skipping 89e4f7e8feb5, consider including orphan ancestors
+  $ hg evolve --rev 677a629bd09c
+  skipping 677a629bd09c, consider including orphan ancestors
 
 Check that uncommit respects the allowunstable option
 With only createmarkers we can only uncommit on a head
@@ -1266,38 +1266,38 @@
   > [experimental]
   > evolution=createmarkers, allnewcommands
   > EOF
-  $ hg up 274b6cd0c101^
+  $ hg up cc75952078c6^
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg uncommit --all
   abort: cannot uncommit changeset, as that will orphan 4 descendants
   (see 'hg help evolution.instability')
   [10]
-  $ hg up 274b6cd0c101
+  $ hg up cc75952078c6
   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 "5478ae0ce2d9::"
+  @  23:4086309bffa5@default(draft) add j1
   |
-  | *  21:89e4f7e8feb5@default(draft) add j3
+  | *  21:677a629bd09c@default(draft) add j3
   | |
-  | *  20:4cd61236beca@default(draft) add j2
+  | *  20:0208ef487f3a@default(draft) add j2
   | |
-  | x  19:0fd8bfb02de4@default(draft) add j1
+  | x  19:30d3ac01aa58@default(draft) add j1
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  18:5f8a4fc86068@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  17:a38ac764661b@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@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 5f8a4fc86068
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg evolve --all
   nothing to evolve on current working copy parent
@@ -1307,42 +1307,42 @@
   move:[20] add j2
   atop:[23] add j1
   move:[21] add j3
-  $ glog -r "0cf3707e8971::"
-  o  25:0d9203b74542@default(draft) add j3
+  $ glog -r "5478ae0ce2d9::"
+  o  25:bc61f0de3ab8@default(draft) add j3
   |
-  o  24:f1b85956c48c@default(draft) add j2
+  o  24:57c9733eb876@default(draft) add j2
   |
-  o  23:0ef9ff75f8e2@default(draft) add j1
+  o  23:4086309bffa5@default(draft) add j1
   |
-  | @  18:0c049e4e5422@default(draft) add gh
+  | @  18:5f8a4fc86068@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  17:a38ac764661b@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@default(draft) a3
   |
   ~
-  $ hg up 98e171e2f272
+  $ hg up a38ac764661b
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit c5_
   created new head
-  $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
+  $ hg prune '4086309bffa5 + 57c9733eb876'
   abort: cannot prune changeset, as that will orphan 1 descendants
   (see 'hg help evolution.instability')
   [10]
-  $ hg prune '98e171e2f272::0d9203b74542'
+  $ hg prune 'a38ac764661b::bc61f0de3ab8'
   abort: cannot prune changeset, as that will orphan 1 descendants
   (see 'hg help evolution.instability')
   [10]
-  $ hg prune '0ef9ff75f8e2::'
+  $ hg prune '4086309bffa5::'
   3 changesets pruned
-  $ glog -r "0cf3707e8971::"
-  @  26:4c6f6f6d1976@default(draft) add c5_
+  $ glog -r "5478ae0ce2d9::"
+  @  26:0ea0aab97a68@default(draft) add c5_
   |
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  18:5f8a4fc86068@default(draft) add gh
   | |
-  o |  17:98e171e2f272@default(draft) add gg
+  o |  17:a38ac764661b@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@default(draft) a3
   |
   ~
 
@@ -1350,24 +1350,24 @@
 
 (most of this has been moved to test-fold.t)
 
-  $ hg up 0cf3707e8971
+  $ hg up 5478ae0ce2d9
   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 "5478ae0ce2d9::"
+  @  27:a590ee1f960d@default(draft) add unstableifparentisfolded
   |
-  | o  26:4c6f6f6d1976@default(draft) add c5_
+  | o  26:0ea0aab97a68@default(draft) add c5_
   | |
-  +---o  18:0c049e4e5422@default(draft) add gh
+  +---o  18:5f8a4fc86068@default(draft) add gh
   | |
-  | o  17:98e171e2f272@default(draft) add gg
+  | o  17:a38ac764661b@default(draft) add gg
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@default(draft) a3
   |
   ~
 
-  $ hg fold --exact "98e171e2f272::"
+  $ hg fold --exact "a38ac764661b::"
   2 changesets folded
 
 Check that dirstate changes are kept at failure for conflicts (issue4966)
@@ -1391,20 +1391,20 @@
   $ hg add newlyadded
   $ hg commit -m "will cause conflict at evolve"
 
-  $ glog -r "0cf3707e8971::"
-  @  31:5be050657ca5@default(draft) will cause conflict at evolve
+  $ glog -r "5478ae0ce2d9::"
+  @  31:835945a2b5c1@default(draft) will cause conflict at evolve
   |
-  o  30:748126f98ff1@default(draft) will be evolved safely
+  o  30:c4fb0d23465b@default(draft) will be evolved safely
   |
-  o  29:4548f3a8db2c@default(draft) will be amended
+  o  29:45e2cc1499ee@default(draft) will be amended
   |
-  | o  28:92ca6f3984de@default(draft) add gg
+  | o  28:7992c4aad71c@default(draft) add gg
   | |
-  o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+  o |  27:a590ee1f960d@default(draft) add unstableifparentisfolded
   |/
-  | o  18:0c049e4e5422@default(draft) add gh
+  | o  18:5f8a4fc86068@default(draft) add gh
   |/
-  o  16:0cf3707e8971@default(draft) a3
+  o  16:5478ae0ce2d9@default(draft) a3
   |
   ~
 
@@ -1426,17 +1426,17 @@
   [240]
 
   $ glog -r "desc('add unstableifparentisfolded')::" --hidden
-  @  33:b9acdb1af6d5@default(draft) will be evolved safely
+  @  33:bdb2d79645eb@default(draft) will be evolved safely
   |
-  o  32:6ec468e4cb98@default(draft) amended
+  o  32:d788a38aecda@default(draft) amended
   |
-  | %  31:5be050657ca5@default(draft) will cause conflict at evolve
+  | %  31:835945a2b5c1@default(draft) will cause conflict at evolve
   | |
-  | x  30:748126f98ff1@default(draft) will be evolved safely
+  | x  30:c4fb0d23465b@default(draft) will be evolved safely
   | |
-  | x  29:4548f3a8db2c@default(draft) will be amended
+  | x  29:45e2cc1499ee@default(draft) will be amended
   |/
-  o  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+  o  27:a590ee1f960d@default(draft) add unstableifparentisfolded
   |
   ~
 
--- a/tests/test-prev-next.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-prev-next.t	Fri Oct 07 20:32:14 2022 -0400
@@ -356,13 +356,13 @@
   got lock after (\d+) seconds (re)
   move:[2] two
   atop:[3] one
-  working directory is now at a7d885c75614
+  working directory is now at ab3a85718ec9
   $ wait
 
 testing next --evolve when working directory is dirty
 
   $ hg log -GT "{rev}:{node|short} {desc|firstline}"
-  @  4:a7d885c75614 two
+  @  4:ab3a85718ec9 two
   |
   o  3:c741983992fc one
   
--- a/tests/test-stabilize-order.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-stabilize-order.t	Fri Oct 07 20:32:14 2022 -0400
@@ -81,7 +81,7 @@
   resolving manifests (ondisk !)
   removing b (ondisk !)
   $ glog
-  o  6:81b8bbcd5892@default(draft) addb
+  o  6:bede829dd2d3@default(draft) addb
   |
   @  5:005fe5914f78@default(draft) adda
   |
@@ -100,7 +100,7 @@
   $ hg evolve -v --update
   move:[3] addc
   atop:[6] addb
-  hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
+  hg rebase -r 7a7552255fb5 -d bede829dd2d3
   resolving manifests (ondisk !)
   getting b (ondisk !)
   resolving manifests
@@ -112,7 +112,7 @@
   resolving manifests (inmemory !)
   getting b (inmemory !)
   getting c (inmemory !)
-  working directory is now at 0f691739f917
+  working directory is now at 65095d7d0dd5
   $ hg debugobsolete > successors.new
   $ diff -u successors.old successors.new
   --- successors.old* (glob)
@@ -120,16 +120,16 @@
   @@ -1,3 +1,4 @@
    ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
    93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+   22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   [1]
 
 
 
   $ glog
-  @  7:0f691739f917@default(draft) addc
+  @  7:65095d7d0dd5@default(draft) addc
   |
-  o  6:81b8bbcd5892@default(draft) addb
+  o  6:bede829dd2d3@default(draft) addb
   |
   o  5:005fe5914f78@default(draft) adda
   |
@@ -140,23 +140,23 @@
 
 Test behavior with --any
 
-  $ hg up 81b8bbcd5892
+  $ hg up bede829dd2d3
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
   1 new orphan changesets
   $ glog
-  @  8:7a68bc4596ea@default(draft) addb
+  @  8:036cf654e942@default(draft) addb
   |
-  | *  7:0f691739f917@default(draft) addc
+  | *  7:65095d7d0dd5@default(draft) addc
   | |
-  | x  6:81b8bbcd5892@default(draft) addb
+  | x  6:bede829dd2d3@default(draft) addb
   |/
   o  5:005fe5914f78@default(draft) adda
   |
   o  0:c471ef929e6a@default(draft) addroot
   
-  $ hg up 0f691739f917
+  $ hg up 65095d7d0dd5
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg evolve -v
   nothing to evolve on current working copy parent
@@ -165,7 +165,7 @@
   $ hg evolve --any -v
   move:[7] addc
   atop:[8] addb
-  hg rebase -r 0f691739f917 -d 7a68bc4596ea
+  hg rebase -r 65095d7d0dd5 -d 036cf654e942
   resolving manifests (ondisk !)
   removing c (ondisk !)
   getting b (ondisk !)
@@ -177,11 +177,11 @@
   committing changelog
   resolving manifests (inmemory !)
   getting b (inmemory !)
-  working directory is now at 2256dae6521f
+  working directory is now at e99ecf51c867
   $ glog
-  @  9:2256dae6521f@default(draft) addc
+  @  9:e99ecf51c867@default(draft) addc
   |
-  o  8:7a68bc4596ea@default(draft) addb
+  o  8:036cf654e942@default(draft) addb
   |
   o  5:005fe5914f78@default(draft) adda
   |
@@ -206,33 +206,33 @@
   $ hg commit --amend -m "newmessage"
   2 new orphan changesets
   $ hg log -G
-  @  changeset:   12:f83a0bce03e4
+  @  changeset:   12:49773ccde390
   |  tag:         tip
-  |  parent:      8:7a68bc4596ea
+  |  parent:      8:036cf654e942
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     newmessage
   |
-  | *  changeset:   11:fa68011f392e
-  | |  parent:      9:2256dae6521f
+  | *  changeset:   11:a9892777b519
+  | |  parent:      9:e99ecf51c867
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     secondambiguous
   | |
-  | | *  changeset:   10:bdc003b6eec2
+  | | *  changeset:   10:0b6e26b2472d
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    instability: orphan
   | |    summary:     firstambiguous
   | |
-  | x  changeset:   9:2256dae6521f
+  | x  changeset:   9:e99ecf51c867
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded using amend as 12:f83a0bce03e4
+  |    obsolete:    reworded using amend as 12:49773ccde390
   |    summary:     addc
   |
-  o  changeset:   8:7a68bc4596ea
+  o  changeset:   8:036cf654e942
   |  parent:      5:005fe5914f78
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-unstability-resolution-result.t	Fri Oct 07 18:14:58 2022 -0400
+++ b/tests/test-unstability-resolution-result.t	Fri Oct 07 20:32:14 2022 -0400
@@ -180,10 +180,10 @@
   atop:[6] newer a
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
-  committed as 9bd81588dac8
-  working directory is now at 9bd81588dac8
+  committed as 1e688a4b6db8
+  working directory is now at 1e688a4b6db8
   $ glog
-  @  11:9bd81588dac8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a:
+  @  11:1e688a4b6db8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a:
   |
   | o  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -198,13 +198,13 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 9bd81588dac89b66b4fb6dadd8e33b1ecfe9b408
+  # Node ID 1e688a4b6db81db9b647e9045aff0fcbc5c32b8d
   # Parent  99ec7503cf5a2cd545f41792129becc4172e9e9d
   phase-divergent update to 99ec7503cf5a:
   
   newer a
   
-  diff -r 99ec7503cf5a -r 9bd81588dac8 a
+  diff -r 99ec7503cf5a -r 1e688a4b6db8 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@