--- a/tests/test-evolve-phase-divergence.t Fri May 08 19:19:26 2020 +0800
+++ b/tests/test-evolve-phase-divergence.t Fri May 08 19:22:36 2020 +0800
@@ -345,7 +345,7 @@
$ hg glog
@ 5:3d62500c673d phase-divergent update to aa071e5554e3:
| (bm) draft
- % 3:aa071e5554e3 added foo to foo
+ o 3:aa071e5554e3 added foo to foo
| () public
o 1:4d1169d82e47 modify a
| () public
@@ -361,10 +361,10 @@
@ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
| rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
- % d47f2b37ed82 (4) added bar to foo
+ x d47f2b37ed82 (4) added bar to foo
| rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
- % aa071e5554e3 (3) added foo to foo
+ o aa071e5554e3 (3) added foo to foo
Syncing all other repositories
@@ -500,7 +500,7 @@
$ hg glog
@ 8:502e73736632 phase-divergent update to b756eb10ea73:
| (bm) draft
- % 6:b756eb10ea73 added bar to bar
+ o 6:b756eb10ea73 added bar to bar
| () public
o 5:3d62500c673d phase-divergent update to aa071e5554e3:
| () public
@@ -788,7 +788,7 @@
$ hg glog
@ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () draft
- % 12:dc88f5aa9bc9 y to y and foobar to foo
+ o 12:dc88f5aa9bc9 y to y and foobar to foo
| () public
o 9:2352021b3785 added x to x
| (bm) public
@@ -892,7 +892,7 @@
$ hg glog
@ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
| () draft
- % 17:f3794e5a91dc added l to l
+ o 17:f3794e5a91dc added l to l
| () public
o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
| () public
@@ -1329,7 +1329,7 @@
$ hg glog --hidden
@ 7:88b0dae5369a phase-divergent update to a51bce62c219:
| () draft
- | % 6:98dad8812511 added n
+ | x 6:98dad8812511 added n
| | () draft
+---o 5:86419909e017 phase-divergent update to a51bce62c219:
| | () draft
@@ -1339,7 +1339,7 @@
| | |/ () draft
| | x 2:4f25cd9cd2bf added m
| |/ () draft
- % | 1:a51bce62c219 added m and n
+ o | 1:a51bce62c219 added m and n
|/ () public
o 0:d3873e73d99e init
() public
@@ -1360,7 +1360,7 @@
x | 4f25cd9cd2bf (2) added m
| | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | % 98dad8812511 (6) added n
+ | x 98dad8812511 (6) added n
| | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 52ca78bb98c7 (4) added n
@@ -1369,7 +1369,7 @@
| x e1154ec0206a (3) added n
|/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
- % a51bce62c219 (1) added m and n
+ o a51bce62c219 (1) added m and n
XXX: not sure this is correct
@@ -1801,7 +1801,7 @@
| IV
| V
|
- % changeset: 1:3074c7249d20
+ o changeset: 1:3074c7249d20
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: E1
@@ -1842,7 +1842,7 @@
| rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
- % 599454370881 (2) E2
+ x 599454370881 (2) E2
| rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 3074c7249d20 -r 599454370881 changeset-description
| --- a/changeset-description
@@ -1890,7 +1890,7 @@
| V
|
|
- % 3074c7249d20 (1) E1
+ o 3074c7249d20 (1) E1
$ cd ..