Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 5571: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 | b6c819facbe8 |
| children | afcd4e44816f e5d91fd1f319 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Thu Sep 17 21:19:13 2020 +0200 +++ b/tests/test-stabilize-conflict.t Fri Sep 25 11:06:46 2020 -0700 @@ -141,7 +141,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | @ changeset: 4:71c18f70c34f + | % changeset: 4:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan @@ -234,7 +234,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | @ changeset: 6:1836b91c6c1d + | % changeset: 6:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan