diff tests/test-evolve-public-content-divergent-corner-cases.t @ 6391:9a41c3c293ae mercurial-6.0

test-compat: merge mercurial-6.1 into mercurial-6.0

--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Dec 08 19:17:00 2022 +0400
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Feb 06 18:38:36 2023 +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 @@
@@ -432,7 +432,7 @@
   $ hg sum
   parent: 5:93cd84bbdaca 
    added d
-  parent: 6:2af3359250d3 tip (content-divergent)
+  parent: 6:cf77846279b4 tip (content-divergent)
    added c e
   branch: default
   commit: 1 modified, 1 unknown, 1 unresolved (merge)
@@ -447,27 +447,27 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  committed as bb4d94ae1a5a
-  working directory is now at bb4d94ae1a5a
+  committed as 01169b149789
+  working directory is now at 01169b149789
 
   $ hg export
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560
+  # Node ID 01169b149789f09d81f86d5273e56671ab645590
   # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
   phase-divergent update to 93cd84bbdaca:
   
   added c e
   
-  diff -r 93cd84bbdaca -r bb4d94ae1a5a d
+  diff -r 93cd84bbdaca -r 01169b149789 d
   --- a/d	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -dd
   +resolved
-  diff -r 93cd84bbdaca -r bb4d94ae1a5a e
+  diff -r 93cd84bbdaca -r 01169b149789 e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@