diff -r 0eb80259f9cb -r aafd51f145ea tests/test-evolve-content-divergent-corner-cases.t --- a/tests/test-evolve-content-divergent-corner-cases.t Sat Apr 20 03:55:11 2019 +0200 +++ b/tests/test-evolve-content-divergent-corner-cases.t Tue Apr 23 12:28:32 2019 +0200 @@ -251,17 +251,15 @@ Lets create divergence $ hg prune 4 -s . --hidden 1 changesets pruned - 2 new content-divergent changesets Making obsolete resolution parent $ hg prune 3 1 changesets pruned - 1 new orphan changesets $ hg glog @ 6:de4ea3103326 updated e | () [default] draft - | * 5:ff6f7cd76a7c updated e + | o 5:ff6f7cd76a7c updated e | | () [default] draft | x 3:9150fe93bec6 added d | | () [default] draft @@ -340,18 +338,15 @@ create some content divergence $ hg co dff6e52f5e41 --hidden - updating to a hidden changeset dff6e52f5e41 - (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (dff6e52f5e41) (use 'hg evolve' to update to its successor: 0825dcee2670) $ hg revert -r .^ c $ hg amend - 2 new content-divergent changesets $ hg glog --hidden @ 3:92ecd58f9b05 delete a | () [default] draft - | * 2:0825dcee2670 delete a + | o 2:0825dcee2670 delete a |/ () [default] draft | x 1:dff6e52f5e41 delete a |/ () [default] draft