diff CHANGELOG @ 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.

--- a/CHANGELOG	Thu Sep 17 21:19:13 2020 +0200
+++ b/CHANGELOG	Fri Sep 25 11:06:46 2020 -0700
@@ -8,6 +8,9 @@
   * metaedit: update bookmark location when applicable
   * evolve: fix various issues with --continue when solving content-divergence
   * rewind: add a --dry-run flag
+  * evolve: while resolving conflicts, the evolved node will no longer be a
+    dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`,
+    but it will show up as `%` with hg >= 5.4)
 
 topic (0.20.0)