--- a/tests/test-obsolete.t Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-obsolete.t Sat Jan 13 14:35:49 2018 -0800
@@ -187,6 +187,7 @@
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
2 new obsolescence markers
+ 1 new orphan changesets
$ hg -R ../other-new verify
checking changesets
checking manifests
@@ -210,8 +211,8 @@
$ hg up --hidden 3 -q
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit obsol_d # 6
+ 1 new orphan changesets
created new head
- 1 new orphan changesets
$ hg debugobsolete `getid 5` `getid 6`
obsoleted 1 changesets
$ qlog
@@ -269,8 +270,8 @@
$ hg up --hidden -q .^ # 3
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d'" # 7
+ 1 new orphan changesets
created new head
- 1 new orphan changesets
$ hg debugobsolete `getid 6` `getid 7`
obsoleted 1 changesets
$ hg pull -R ../other-new .
@@ -360,8 +361,8 @@
$ hg up --hidden .^ -q # 3
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d''"
+ 1 new orphan changesets
created new head
- 1 new orphan changesets
$ hg debugobsolete `getid 7` `getid 8`
obsoleted 1 changesets
$ cd ../other-new
@@ -426,6 +427,7 @@
$ hg id -n
9
$ hg debugobsolete `getid 0` `getid 9`
+ 1 new phase-divergent changesets
83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
# at core level the warning is not issued
# this is now a big issue now that we have bumped warning
@@ -554,6 +556,7 @@
added 2 changesets with 1 changes to [12] files (re)
3 new obsolescence markers
obsoleted 1 changesets
+ 2 new content-divergent changesets
$ hg up -q 10
$ mkcommit "obsol_d'''"
created new head
@@ -684,6 +687,7 @@
phases: 3 draft
phase-divergent: 1 changesets
$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
+ 2 new content-divergent changesets
$ hg log -r 'contentdivergent()'
changeset: 12:6db5e282cb91
parent: 10:2033b4e49474