--- a/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 02:15:48 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 01:57:13 2018 +0200
@@ -37,9 +37,9 @@
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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg amend -m "A2"
@@ -337,8 +337,8 @@
(use --hidden to access hidden revisions)
[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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' has diverged)
working directory parent is obsolete! (471f378eab4c)
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)