--- a/tests/test-evolve-obshistory-phase-divergent.t Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-evolve-obshistory-phase-divergent.t Thu Aug 02 02:47:44 2018 +0200
@@ -37,15 +37,13 @@
summary: ROOT
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg phase -p .
1 new phase-divergent changesets
$ hg log --hidden -G
- * changeset: 2:fdf9bde5129a
+ o changeset: 2:fdf9bde5129a
| tag: tip
| parent: 0:ea207398892e
| user: test
@@ -81,7 +79,7 @@
Check that with all option, every changeset is shown
$ hg obslog --hidden --all 471f378eab4c --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -121,7 +119,7 @@
Check that debugobshistory on the first diverged revision show the revision
and the diverent one
$ hg obslog fdf9bde5129a --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -136,7 +134,7 @@
Check that all option show all of them
$ hg obslog fdf9bde5129a -a --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -151,7 +149,7 @@
Check that debugobshistory on the second diverged revision show the revision
and the diverent one
$ hg obslog fdf9bde5129a --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -165,7 +163,7 @@
Check that all option show all of them
$ hg obslog fdf9bde5129a -a --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -180,7 +178,7 @@
Check that debugobshistory on the both diverged revision show a coherent
graph
$ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch
- * fdf9bde5129a (2) A1
+ o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)