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.
Showing
- CHANGELOG 3 additions, 0 deletionsCHANGELOG
- hgext3rd/evolve/evolvecmd.py 0 additions, 3 deletionshgext3rd/evolve/evolvecmd.py
- tests/test-evolve-abort-orphan.t 5 additions, 11 deletionstests/test-evolve-abort-orphan.t
- tests/test-evolve-abort-phasediv.t 0 additions, 8 deletionstests/test-evolve-abort-phasediv.t
- tests/test-evolve-phase.t 1 addition, 1 deletiontests/test-evolve-phase.t
- tests/test-evolve.t 1 addition, 1 deletiontests/test-evolve.t
- tests/test-stabilize-conflict.t 2 additions, 2 deletionstests/test-stabilize-conflict.t
Loading
-
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)
-
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)
Please register or sign in to comment