Mercurial > evolve

diff tests/test-evolve.t @ 5571:b2de5825e5ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 98e2613d797d
children ee18173c54a2 e5d91fd1f319
line wrap: on
line diff
--- a/tests/test-evolve.t	Thu Sep 17 21:19:13 2020 +0200
+++ b/tests/test-evolve.t	Fri Sep 25 11:06:46 2020 -0700
@@ -1401,7 +1401,7 @@
   |
   o  32:6ec468e4cb98@default(draft) amended
   |
-  | @  31:5be050657ca5@default(draft) will cause conflict at evolve
+  | %  31:5be050657ca5@default(draft) will cause conflict at evolve
   | |
   | x  30:748126f98ff1@default(draft) will be evolved safely
   | |