--- a/tests/test-obsolete.t Tue Jul 25 15:17:17 2017 +0200
+++ b/tests/test-obsolete.t Wed Sep 27 01:07:22 2017 +0200
@@ -693,11 +693,11 @@
[2]
$ hg olog
@ 0d3f46688ccc (3) add obsol_c
- | rewritten(parent) by test (*) as 2033b4e49474 (glob)
- | rewritten by test (*) as 725c380fe99b (glob)
+ | rewritten(parent) as 2033b4e49474 by test (*) (glob)
+ | rewritten as 725c380fe99b by test (*) (glob)
|
x 4538525df7e2 (2) add c
- rewritten by test (*) as 0d3f46688ccc (glob)
+ rewritten as 0d3f46688ccc by test (*) (glob)
Check import reports new unstable changeset:
@@ -705,7 +705,7 @@
$ hg up --hidden 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (4538525df7e2)
- (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+ (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
$ hg export 9468a5f5d8b2 | hg import -
applying patch from stdin
1 new unstable changesets