--- a/tests/test-obsmarker-template.t Wed Jan 10 14:00:23 2018 -0800
+++ b/tests/test-obsmarker-template.t Sun Jan 14 23:59:17 2018 -0800
@@ -591,6 +591,7 @@
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
obsoleted 1 changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
obsoleted 1 changesets
@@ -817,6 +818,7 @@
updating to a hidden changeset 471f378eab4c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "A2"
+ 2 new content-divergent changesets
$ hg log --hidden -G
@ changeset: 3:65b757b745b9
| tag: tip
@@ -1112,6 +1114,7 @@
created new head
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
obsoleted 1 changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
obsoleted 1 changesets
@@ -1589,6 +1592,7 @@
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
obsoleted 1 changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
@@ -1874,10 +1878,12 @@
$ hg up 6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg commit --amend -m "Add only B"
+ 1 new orphan changesets
$ hg up 6 --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg commit --amend -m "Add B only"
+ 4 new content-divergent changesets
$ hg log -G
@ changeset: 9:0b997eb7ceee