--- a/tests/test-obsolete.t Thu Aug 10 17:37:31 2017 +0200
+++ b/tests/test-obsolete.t Thu Aug 10 17:57:50 2017 +0200
@@ -686,7 +686,7 @@
parent: 10:2033b4e49474
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: bumped, divergent
+ instability: bumped, content-divergent
summary: add obsol_d'''
changeset: 16:50f11e5e3a63
@@ -694,7 +694,7 @@
parent: 11:9468a5f5d8b2
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: divergent
+ instability: content-divergent
summary: add obsolet_conflicting_d
@@ -719,7 +719,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
@@ -741,7 +741,7 @@
| | parent: 11:9468a5f5d8b2
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: divergent
+ | | instability: content-divergent
| | summary: add obsolet_conflicting_d
| |
| | o changeset: 15:705ab2a6b72e
@@ -767,7 +767,7 @@
| | |/ parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | instability: bumped, divergent
+ | | | instability: bumped, content-divergent
| | | summary: add obsol_d'''
| | |
| o | changeset: 11:9468a5f5d8b2