--- a/tests/test-evolve-phase-divergence.t Tue Apr 24 08:57:18 2018 +0100
+++ b/tests/test-evolve-phase-divergence.t Mon Apr 23 12:11:10 2018 +0200
@@ -571,17 +571,8 @@
rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg glog -r .^::
- @ 10:334e300d6db5 added x to x
- | (bm) draft
- | o 9:2352021b3785 added x to x
- | | () public
- | o 8:502e73736632 phase-divergent update to b756eb10ea73:
- | | () public
- | o 6:b756eb10ea73 added bar to bar
- |/ () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
- | () public
- ~
+ hg: parse error at 4: not a prefix: end
+ [255]
Using `hg evolve` to resolve phase-divergence
---------------------------------------------
@@ -972,7 +963,7 @@
$ hg glog -r 428f7900a969::
@ 28:63ccb8ea7cae added n
| () draft
- * 27:f313e2b90e70 added m
+ o 27:f313e2b90e70 added m
| () draft
| o 26:849cee0a874b added m and n
|/ () public
@@ -985,7 +976,6 @@
atop:[26] added m and n
computing new diff
committed as 870e1c3eddc3
- 1 new orphan changesets
recreate:[28] added n
atop:[26] added m and n
rebasing to destination parent: 428f7900a969
@@ -1085,7 +1075,7 @@
$ hg glog -r 154b0179fb9b::
@ 34:e046341aa97c added q
| () draft
- | * 33:6f8c250eecff added p
+ | o 33:6f8c250eecff added p
|/ () draft
| o 32:8a70f55b2af3 added p and q
|/ () public