--- a/tests/test-evolve-issue5958.t	Fri Dec 20 14:08:37 2019 +0700
+++ b/tests/test-evolve-issue5958.t	Mon Nov 25 02:41:16 2019 +0530
@@ -86,3 +86,48 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 new orphan changesets
   working directory is now at 459c64f7eaad
+
+  $ hg log -Gp
+  @  changeset:   7:459c64f7eaad
+  |  tag:         tip
+  |  parent:      4:c17bf400a278
+  |  user:        test
+  |  date:        Wed Dec 31 23:59:58 1969 -0000
+  |  instability: orphan
+  |  summary:     add foo.txt
+  |
+  |  diff -r c17bf400a278 -r 459c64f7eaad 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
+  |  --- /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
+  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  |  +++ b/foo.txt	Wed Dec 31 23:59:59 1969 -0000
+  |  @@ -0,0 +1,1 @@
+  |  +hi
+  |
+  o  changeset:   0:a24ed8ad918c
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     add r0
+  
+     diff -r 000000000000 -r a24ed8ad918c r0
+     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+     +++ b/r0	Thu Jan 01 00:00:00 1970 +0000
+     @@ -0,0 +1,1 @@
+     +hi
+