--- a/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 02:47:44 2018 +0200
@@ -37,8 +37,6 @@
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)
@@ -53,7 +51,7 @@
| instability: content-divergent
| summary: A2
|
- | * changeset: 2:fdf9bde5129a
+ | o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -100,7 +98,7 @@
$ hg obslog --hidden --all 471f378eab4c --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -163,7 +161,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
|
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -188,7 +186,7 @@
$ hg obslog fdf9bde5129a -a --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -235,7 +233,7 @@
$ hg obslog 65b757b745b9 -a --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -260,7 +258,7 @@
$ hg obslog '65b757b745b9+fdf9bde5129a' --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -337,8 +335,6 @@
(use --hidden to access hidden revisions; diverged)
[255]
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' has diverged)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)