Skip to content
Snippets Groups Projects
Commit b2de5825 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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.
parent 15cc9906
No related branches found
No related tags found
2 merge requests!273compatibility branches for 10.1.0,!255Topic/default/evolve dirstate parents
Pipeline #37932 passed
Loading
  • Raphaël Gomès @raphael.gomes

    mentioned in commit 9f0146bf1156

    By Anton Shestakov on 2020-10-31T10:57:15 (imported from GitLab)

    ·

    mentioned in commit 9f0146bf1156

    By Anton Shestakov on 2020-10-31T10:57:15 (imported from GitLab)

    Toggle commit list
  • Raphaël Gomès @raphael.gomes

    mentioned in commit 9f0146bf1156

    By Anton Shestakov on 2020-10-31T10:57:15 (imported from GitLab)

    ·

    mentioned in commit 9f0146bf1156

    By Anton Shestakov on 2020-10-31T10:57:15 (imported from GitLab)

    Toggle commit list
  • Raphaël Gomès @raphael.gomes

    mentioned in commit afcd4e44816f

    By Anton Shestakov on 2020-10-31T12:36:44 (imported from GitLab)

    ·

    mentioned in commit afcd4e44816f

    By Anton Shestakov on 2020-10-31T12:36:44 (imported from GitLab)

    Toggle commit list
  • Raphaël Gomès @raphael.gomes

    mentioned in commit afcd4e44816f

    By Anton Shestakov on 2020-10-31T12:36:44 (imported from GitLab)

    ·

    mentioned in commit afcd4e44816f

    By Anton Shestakov on 2020-10-31T12:36:44 (imported from GitLab)

    Toggle commit list
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment