--- a/tests/test-evolve-phase-divergence.t Wed Mar 20 09:19:02 2019 -0700
+++ b/tests/test-evolve-phase-divergence.t Tue Mar 26 12:30:10 2019 +0100
@@ -196,7 +196,6 @@
$ hg evolve --phase-divergent
recreate:[2] tweak a
atop:[1] modify a
- computing new diff
no changes to commit
working directory is now at 4d1169d82e47
@@ -311,7 +310,6 @@
$ hg evolve --phase-divergent
recreate:[4] added bar to foo
atop:[3] added foo to foo
- computing new diff
committed as 3d62500c673d
working directory is now at 3d62500c673d
@@ -462,7 +460,6 @@
$ hg evolve --phase-divergent
recreate:[7] foo to bar
atop:[6] added bar to bar
- computing new diff
committed as 502e73736632
working directory is now at 502e73736632
@@ -599,7 +596,6 @@
atop:[9] added x to x
rebasing to destination parent: 502e73736632
(leaving bookmark bm)
- computing new diff
no changes to commit
working directory is now at 2352021b3785
@@ -718,7 +714,6 @@
recreate:[14] y to y and foobar to foo
atop:[12] y to y and foobar to foo
rebasing to destination parent: 2352021b3785
- computing new diff
committed as 8c2bb6fb44e9
working directory is now at 8c2bb6fb44e9
@@ -822,7 +817,6 @@
$ hg evolve --continue
evolving 19:5fd38c0de46e "added l to l"
- computing new diff
committed as e3090241a10c
working directory is now at e3090241a10c
@@ -919,7 +913,6 @@
recreate:[24] added f
atop:[23] added g
rebasing to destination parent: 21ae52e414e6
- computing new diff
no changes to commit
working directory is now at 428f7900a969
@@ -986,13 +979,11 @@
$ hg evolve --all --phase-divergent
recreate:[2] added m
atop:[1] added m and n
- computing new diff
committed as 86419909e017
1 new orphan changesets
recreate:[3] added n
atop:[1] added m and n
rebasing to destination parent: d3873e73d99e
- computing new diff
committed as 89ba615ea1ec
working directory is now at 89ba615ea1ec
@@ -1105,11 +1096,9 @@
$ hg evolve --all --phase-divergent
recreate:[2] added p
atop:[1] added p and q
- computing new diff
committed as 25875a9cb640
recreate:[3] added q
atop:[1] added p and q
- computing new diff
committed as 26f564f94bcc
working directory is now at 26f564f94bcc