diff -r 9af0e2b0bdd7 -r 684cc3418ecd tests/test-evolve-abort-orphan.t --- a/tests/test-evolve-abort-orphan.t Fri Aug 03 00:19:47 2018 +0200 +++ b/tests/test-evolve-abort-orphan.t Tue Aug 21 13:26:35 2018 +0200 @@ -88,6 +88,21 @@ fix conflicts and see `hg help evolve.interrupted` [1] + $ hg parents + changeset: 5:e93a9161a274 + tag: tip + parent: 2:b1661037fa25 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: added c + + changeset: 4:c41c793e0ef1 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + instability: orphan + summary: added d + + $ hg evolve --abort evolve aborted working directory is now at e93a9161a274 @@ -173,7 +188,7 @@ | () draft | o 6:e83de241f751 added d | | () draft - | o 5:e93a9161a274 added c + | @ 5:e93a9161a274 added c | | () draft | x 2:b1661037fa25 added b | | () draft @@ -265,7 +280,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | o 6:8f20d4390c21 foo to a + | @ 6:8f20d4390c21 foo to a | | () draft | | o 5:bcb1c47f8520 added d | | | () draft @@ -327,7 +342,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | o 6:8f20d4390c21 foo to a + | @ 6:8f20d4390c21 foo to a | | () draft | | o 5:bcb1c47f8520 added d | | | () draft @@ -410,7 +425,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | o 6:8f20d4390c21 foo to a + | @ 6:8f20d4390c21 foo to a | | () draft | x 1:2f913b0c9220 added a |/ () draft @@ -478,7 +493,7 @@ | (bm1) draft o 4:a0086c17bfc7 added a | () draft - | o 3:17509928e5bf added c + | @ 3:17509928e5bf added c | | () draft | x 2:9f0c80a55ddc added b | | () draft @@ -521,3 +536,19 @@ $ hg evolve --abort evolve aborted working directory is now at c1f4718020e3 + + $ ls .hg/ + 00changelog.i + bookmarks + branch + cache + dirstate + last-message.txt + requires + store + undo.backup.bookmarks + undo.backup.dirstate + undo.bookmarks + undo.branch + undo.desc + undo.dirstate