--- a/tests/test-evolve-content-divergence.t Thu Jun 07 18:13:54 2018 +0530
+++ b/tests/test-evolve-content-divergence.t Thu Jun 07 18:18:10 2018 +0530
@@ -545,8 +545,6 @@
$ hg glog
@ 20:bbaca013758a added y
| () [bar] draft
- | * 19:6d515d1ffc69 added y
- |/ () [default] draft
o 14:be41fdcd0ee1 added foo to x
| () [bar] draft
o 9:b6b20b8eefdc added d
@@ -561,18 +559,18 @@
() [default] draft
$ hg obslog -r . --all
- * 6d515d1ffc69 (19) added y
- |
- | @ bbaca013758a (20) added y
- |/|
- x | 29e08829c51f (16) added y
- | | rewritten(parent) as 6d515d1ffc69 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | | rewritten(branch, parent, content) as bbaca013758a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | |
- | x 4065e1d314c3 (18) added y
+ @ bbaca013758a (20) added y
+ |\
+ x | 4065e1d314c3 (18) added y
| | rewritten(content) as bbaca013758a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x f1d75198aac4 (17) added y
+ | x 6d515d1ffc69 (19) added y
+ | | rewritten(branch, content) as bbaca013758a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | |
+ | x 29e08829c51f (16) added y
+ | | rewritten(parent) as 6d515d1ffc69 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | |
+ x | f1d75198aac4 (17) added y
|/ rewritten(content) as 4065e1d314c3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 9c30046901ab (15) added y