diff -r ef1c322c389d -r f54bb6eaf5e6 tests/test-uncommit.t --- a/tests/test-uncommit.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-uncommit.t Thu Apr 11 22:44:53 2019 +0200 @@ -238,15 +238,12 @@ Test phase is preserved, no local changes $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) working directory parent is obsolete! (5eb72dbe0cb4) (use 'hg evolve' to update to its successor: e8db4aa611f6) $ hg --config extensions.purge= purge $ hg uncommit -I 'set:added() and e' - 2 new content-divergent changesets $ hg st --copies A e $ hg st --copies --change . @@ -270,7 +267,7 @@ $ glog --hidden @ 5:a1d4c1ad76cc@bar(draft) touncommit | - | * 4:e8db4aa611f6@bar(draft) touncommit + | o 4:e8db4aa611f6@bar(draft) touncommit |/ | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |/ @@ -287,14 +284,11 @@ Test --all $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e - 1 new content-divergent changesets $ hg st --copies M b M d @@ -341,7 +335,6 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [8] touncommit $ hg uncommit aa - 1 new orphan changesets Test uncommiting agains a different base