--- a/tests/test-evolve-issue5958.t	Mon Dec 30 00:11:00 2019 +0530
+++ b/tests/test-evolve-issue5958.t	Sun Dec 29 23:59:41 2019 +0530
@@ -80,43 +80,33 @@
        rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg evolve --content-divergent
-  merge:[6] add foo.txt
-  with: [4] add foo.txt
+  merge:[4] add foo.txt
+  with: [6] add foo.txt
   base: [1] add foo.txt
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  1 new orphan changesets
-  working directory is now at 459c64f7eaad
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 95a06d27be64
 
   $ hg log -Gp
-  @  changeset:   7:459c64f7eaad
+  @  changeset:   7:95a06d27be64
   |  tag:         tip
-  |  parent:      4:c17bf400a278
+  |  parent:      0:a24ed8ad918c
   |  user:        test
   |  date:        Wed Dec 31 23:59:58 1969 -0000
-  |  instability: orphan
   |  summary:     add foo.txt
   |
-  |  diff -r c17bf400a278 -r 459c64f7eaad bar.txt
+  |  diff -r a24ed8ad918c -r 95a06d27be64 bar.txt
   |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/bar.txt	Wed Dec 31 23:59:58 1969 -0000
   |  @@ -0,0 +1,1 @@
   |  +hi
-  |  diff -r c17bf400a278 -r 459c64f7eaad baz.txt
+  |  diff -r a24ed8ad918c -r 95a06d27be64 baz.txt
   |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/baz.txt	Wed Dec 31 23:59:58 1969 -0000
   |  @@ -0,0 +1,1 @@
   |  +hi
-  |
-  x  changeset:   4:c17bf400a278
-  |  parent:      0:a24ed8ad918c
-  |  user:        test
-  |  date:        Wed Dec 31 23:59:59 1969 -0000
-  |  obsolete:    rewritten using evolve as 7:459c64f7eaad
-  |  summary:     add foo.txt
-  |
-  |  diff -r a24ed8ad918c -r c17bf400a278 foo.txt
+  |  diff -r a24ed8ad918c -r 95a06d27be64 foo.txt
   |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |  +++ b/foo.txt	Wed Dec 31 23:59:59 1969 -0000
+  |  +++ b/foo.txt	Wed Dec 31 23:59:58 1969 -0000
   |  @@ -0,0 +1,1 @@
   |  +hi
   |