--- a/tests/test-evolve-public-content-divergent-main.t	Tue May 05 16:29:52 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Apr 30 10:05:14 2020 -0700
@@ -77,16 +77,16 @@
   base: [1] added b
   merging b
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  committed as c1aa9cfb6cf8
-  working directory is now at c1aa9cfb6cf8
+  committed as d1939bca1663
+  working directory is now at d1939bca1663
 
 Following graph log shows that it correctly merged the two divergent csets:
 
   $ hg glog -p
-  @  5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f:
+  @  5:d1939bca1663 phase-divergent update to 44f360db368f:
   |   draft
   |
-  |  diff -r 44f360db368f -r c1aa9cfb6cf8 b
+  |  diff -r 44f360db368f -r d1939bca1663 b
   |  --- a/b	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   |  @@ -1,2 +1,3 @@
@@ -181,11 +181,11 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  committed as 1a739394e9d4
-  working directory is now at 1a739394e9d4
+  committed as c2581b54d60b
+  working directory is now at c2581b54d60b
 
   $ hg glog
-  @  5:1a739394e9d4 phase-divergent update to 580f2d01e52c:
+  @  5:c2581b54d60b phase-divergent update to 580f2d01e52c:
   |   draft
   |
   %  2:580f2d01e52c added b
@@ -271,11 +271,11 @@
   base: [3] added d
   rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  committed as 4cbe48a0c3d9
-  working directory is now at 4cbe48a0c3d9
+  committed as f725f11cbd60
+  working directory is now at f725f11cbd60
 
   $ hg glog -l 1
-  @  8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca:
+  @  8:f725f11cbd60 phase-divergent update to 93cd84bbdaca:
   |   draft
   ~
 
@@ -392,20 +392,20 @@
   $ hg evolve --continue
   evolving 4:f31bcc378766 "added d c e"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  committed as 412dde898967
-  working directory is now at 412dde898967
+  committed as 334db71a5c88
+  working directory is now at 334db71a5c88
   $ hg export
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 412dde898967b50e7d334aefff778a9af46d29d1
+  # Node ID 334db71a5c8882e05b058211106160276f7f4dfc
   # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
   phase-divergent update to 93cd84bbdaca:
   
   added d c e
   
-  diff -r 93cd84bbdaca -r 412dde898967 e
+  diff -r 93cd84bbdaca -r 334db71a5c88 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 @@
@@ -500,7 +500,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  committed as 2a0f44767904
+  committed as b1775d4db34b
   working directory is now at 93cd84bbdaca
 
   $ hg evolve -l
@@ -628,7 +628,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  committed as b9082a9e66ce
+  committed as 55e73d2050d5
   working directory is now at 93cd84bbdaca
 
   $ hg evolve -l