--- a/tests/test-obsolete.t Wed Apr 10 16:11:59 2019 +0200
+++ b/tests/test-obsolete.t Thu Apr 11 22:13:55 2019 +0200
@@ -236,7 +236,7 @@
abort: push includes orphan changeset: 95de7fc6918d!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
- $ hg push ../other-new -f # use f because there is unstability
+ $ hg push ../other-new -f # use f because there is an orphan
pushing to ../other-new
searching for changes
adding changesets
@@ -431,7 +431,7 @@
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
+# this is now a big issue now that we have phase divergence warning
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -574,7 +574,7 @@
obsoleted 1 changesets
$ cd ..
-check bumped detection
+check phase divergence detection
(make an obsolete changeset public)
$ cd local