--- a/tests/test-obsolete.t Wed Aug 23 23:44:36 2017 +0200
+++ b/tests/test-obsolete.t Thu Aug 24 09:11:06 2017 +0200
@@ -134,7 +134,7 @@
working directory parent is obsolete! (0d3f46688ccc)
(use 'hg evolve' to update to its successor: 725c380fe99b)
$ mkcommit d # 5 (on 3)
- 1 new unstable changesets
+ 1 new orphan changesets
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -210,7 +210,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit obsol_d # 6
created new head
- 1 new unstable changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid 5` `getid 6`
obsoleted 1 changesets
$ qlog
@@ -269,7 +269,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d'" # 7
created new head
- 1 new unstable changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid 6` `getid 7`
obsoleted 1 changesets
$ hg pull -R ../other-new .
@@ -359,7 +359,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d''"
created new head
- 1 new unstable changesets
+ 1 new orphan changesets
$ hg debugobsolete `getid 7` `getid 8`
obsoleted 1 changesets
$ cd ../other-new
@@ -722,7 +722,7 @@
(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
+ 1 new orphan changesets
Relevant marker computation