--- a/tests/test-evolve-phase-divergence.t Wed Apr 08 16:16:09 2020 +0200
+++ b/tests/test-evolve-phase-divergence.t Wed Apr 15 21:52:29 2020 +0800
@@ -345,7 +345,7 @@
$ hg glog
@ 5:3d62500c673d phase-divergent update to aa071e5554e3:
| (bm) draft
- o 3:aa071e5554e3 added foo to foo
+ % 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
@@ -355,10 +355,10 @@
$ hg obslog -r . --all
@ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
|
- x d47f2b37ed82 (4) added bar to foo
+ % d47f2b37ed82 (4) added bar to foo
| rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
- o aa071e5554e3 (3) added foo to foo
+ % aa071e5554e3 (3) added foo to foo
rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -495,7 +495,7 @@
$ hg glog
@ 8:502e73736632 phase-divergent update to b756eb10ea73:
| (bm) draft
- o 6:b756eb10ea73 added bar to bar
+ % 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
@@ -753,7 +753,7 @@
$ hg glog
@ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () draft
- o 12:dc88f5aa9bc9 y to y and foobar to foo
+ % 12:dc88f5aa9bc9 y to y and foobar to foo
| () public
o 9:2352021b3785 added x to x
| (bm) public
@@ -841,7 +841,7 @@
$ hg glog
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () draft
- o 17:f3794e5a91dc added l to l
+ % 17:f3794e5a91dc added l to l
| () public
o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () public
@@ -1267,7 +1267,7 @@
$ hg glog --hidden
@ 7:88b0dae5369a phase-divergent update to a51bce62c219:
| () draft
- | x 6:98dad8812511 added n
+ | % 6:98dad8812511 added n
| | () draft
+---o 5:86419909e017 phase-divergent update to a51bce62c219:
| | () draft
@@ -1277,7 +1277,7 @@
| | |/ () draft
| | x 2:4f25cd9cd2bf added m
| |/ () draft
- o | 1:a51bce62c219 added m and n
+ % | 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
@@ -1290,7 +1290,7 @@
x | 4f25cd9cd2bf (2) added m
| | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x 98dad8812511 (6) added n
+ | % 98dad8812511 (6) added n
| | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 52ca78bb98c7 (4) added n
@@ -1299,7 +1299,7 @@
| x e1154ec0206a (3) added n
|/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
- o a51bce62c219 (1) added m and n
+ % a51bce62c219 (1) added m and n
split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -1730,7 +1730,7 @@
| IV
| V
|
- o changeset: 1:3074c7249d20
+ % changeset: 1:3074c7249d20
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: E1
@@ -1766,11 +1766,11 @@
$ hg obslog --patch
@ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
|
- x 599454370881 (2) E2
+ % 599454370881 (2) E2
| rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
- o 3074c7249d20 (1) E1
+ % 3074c7249d20 (1) E1
rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 3074c7249d20 -r 599454370881 changeset-description
--- a/changeset-description