diff -r 0471b9ddd0b2 -r 844b1ad5b34b tests/test-evolve-public-content-divergent-main.t
--- a/tests/test-evolve-public-content-divergent-main.t	Wed Apr 08 01:17:01 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-main.t	Fri May 08 22:50:09 2020 +0800
@@ -43,7 +43,7 @@
 
 Make an amend and change phase to public:
 
-  $ sed -i "1 i I am first" b
+  $ printf "I am first\nb\n" > b
   $ hg amend
   $ hg phase --public
 
@@ -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 b11d193ede1d
+  working directory is now at b11d193ede1d
 
 Following graph log shows that it correctly merged the two divergent csets:
 
   $ hg glog -p
-  @  5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f:
+  @  5:b11d193ede1d phase-divergent update to 44f360db368f:
   |   draft
   |
-  |  diff -r 44f360db368f -r c1aa9cfb6cf8 b
+  |  diff -r 44f360db368f -r b11d193ede1d 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 4ae447c511d3
+  working directory is now at 4ae447c511d3
 
   $ hg glog
-  @  5:1a739394e9d4 phase-divergent update to 580f2d01e52c:
+  @  5:4ae447c511d3 phase-divergent update to 580f2d01e52c:
   |   draft
   |
   o  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 07aa587dcd2b
+  working directory is now at 07aa587dcd2b
 
   $ hg glog -l 1
-  @  8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca:
+  @  8:07aa587dcd2b 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 4bce4ff71bf9
+  working directory is now at 4bce4ff71bf9
   $ hg export
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 412dde898967b50e7d334aefff778a9af46d29d1
+  # Node ID 4bce4ff71bf901840aebb0aa87716e878938b55e
   # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
   phase-divergent update to 93cd84bbdaca:
   
   added d c e
   
-  diff -r 93cd84bbdaca -r 412dde898967 e
+  diff -r 93cd84bbdaca -r 4bce4ff71bf9 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 d87a8f56f14a
   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 ba823b8ff683
   working directory is now at 93cd84bbdaca
 
   $ hg evolve -l