Mercurial > hg > evolve
diff tests/test-evolve-abort-orphan.t @ 5676:b2de5825e5ca
evolve: don't set evolved node as dirstate p2
Upstream rebase changed in 9c9cfecd4600 (rebase: don't use rebased
node as dirstate p2 (BC), 2020-01-10) so the dirstate parents are
always the commits that will be parents once the commit has been
created. Let's follow their lead so the experience is consistent.
The drawback is that users who use Evolve with older Mercurial
versions will not see in `hg log -G` output which commit is being
evolved.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 25 Sep 2020 11:06:46 -0700 |
| parents | 2e14a9386316 |
| children | afcd4e44816f e5d91fd1f319 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t +++ b/tests/test-evolve-abort-orphan.t @@ -111,12 +111,6 @@ 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 - #if abortcommand when in dry-run mode $ hg abort --dry-run @@ -209,7 +203,7 @@ | () draft | * 6:e83de241f751 added d | | () draft - | @ 5:e93a9161a274 added c + | % 5:e93a9161a274 added c | | () draft | x 2:b1661037fa25 added b | | () draft @@ -303,7 +297,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | @ 6:8f20d4390c21 foo to a + | % 6:8f20d4390c21 foo to a | | () draft | | * 5:bcb1c47f8520 added d | | | () draft @@ -367,7 +361,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | @ 6:8f20d4390c21 foo to a + | % 6:8f20d4390c21 foo to a | | () draft | | * 5:bcb1c47f8520 added d | | | () draft @@ -452,7 +446,7 @@ |/ () draft @ 7:807e8e2ca559 added a | () draft - | @ 6:8f20d4390c21 foo to a + | % 6:8f20d4390c21 foo to a | | () draft | x 1:2f913b0c9220 added a |/ () draft @@ -520,7 +514,7 @@ | (bm1) draft o 4:a0086c17bfc7 added a | () draft - | @ 3:17509928e5bf added c + | % 3:17509928e5bf added c | | () draft | x 2:9f0c80a55ddc added b | | () draft