Mercurial > evolve

diff tests/test-evolve-abort-phasediv.t @ 4454:f530850c8184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: drop the "computing new diff message" for phase-divergence Future code update will remove this message, dropping it early clarify the future diff.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Mar 2019 12:30:10 +0100
parents 700b8b3a5a54
children f54bb6eaf5e6 b6c819facbe8
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t	Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve-abort-phasediv.t	Tue Mar 26 12:30:10 2019 +0100
@@ -207,7 +207,6 @@
   recreate:[7] added d
   atop:[4] added d
   rebasing to destination parent: ca1b80f7960a
-  computing new diff
   no changes to commit
   recreate:[9] added c
   atop:[3] added c
@@ -292,7 +291,6 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 9:28cd06b3f801 "added c"
-  computing new diff
   committed as 95d746965290
   recreate:[10] added d
   atop:[4] added d