--- a/tests/test-evolve-phase-divergence.t Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t Sun Apr 14 02:18:19 2019 +0800
@@ -199,7 +199,7 @@
XXX: evolve should have mentioned that draft commit is just obsoleted in favour
of public one. From the message it looks like a new commit is created.
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[2] tweak a
atop:[1] modify a
no changes to commit
@@ -315,7 +315,7 @@
XXX: we should document what should user expect where running this, writing this
test I have to go through code base to understand what will be the behavior
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[4] added bar to foo
atop:[3] added foo to foo
committed as 3d62500c673d
@@ -468,7 +468,7 @@
Resolving the new phase-divergence changeset using `hg evolve`
---------------------------------------------------------------
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[7] foo to bar
atop:[6] added bar to bar
committed as 502e73736632
@@ -604,7 +604,7 @@
Using `hg evolve` to resolve phase-divergence
---------------------------------------------
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[10] added x to x
atop:[9] added x to x
rebasing to destination parent: 502e73736632
@@ -725,7 +725,7 @@
Resolving divergence using `hg evolve`
-------------------------------------
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[14] y to y and foobar to foo
atop:[12] y to y and foobar to foo
rebasing to destination parent: 2352021b3785
@@ -801,7 +801,7 @@
Resolution using `hg evolve --phase-divergent`
----------------------------------------------
- $ hg evolve --phase-divergent
+ $ hg evolve --phase-divergent --update
recreate:[19] added l to l
atop:[17] added l to l
rebasing to destination parent: 8c2bb6fb44e9