diff tests/test-evolve.t @ 4512:7a779a288793 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

--- a/tests/test-evolve.t	Tue Jan 22 12:54:43 2019 -0500
+++ b/tests/test-evolve.t	Thu Apr 11 22:41:41 2019 +0200
@@ -81,23 +81,22 @@
       explicitly assert support for the obsolescence feature (this can currently
       only be done via an extension).
   
-      Instability ==========
+      Instability
+      ===========
   
-      (note: the vocabulary is in the process of being updated)
-  
-      Rewriting changesets might introduce instability (currently 'trouble').
+      Rewriting changesets might introduce instability.
   
       There are two main kinds of instability: orphaning and diverging.
   
-      Orphans are changesets left behind when their ancestors are rewritten,
-      (currently: 'unstable'). Divergence has two variants:
+      Orphans are changesets left behind when their ancestors are rewritten.
+      Divergence has two variants:
   
       * Content-divergence occurs when independent rewrites of the same
-        changesets lead to different results. (currently: 'divergent')
+        changesets lead to different results.
       * Phase-divergence occurs when the old (obsolete) version of a changeset
-        becomes public. (currently: 'bumped')
+        becomes public.
   
-      If it possible to prevent local creation of orphans by using the following
+      It is possible to prevent local creation of orphans by using the following
       config:
   
         [experimental]
@@ -145,7 +144,7 @@
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
   1 public 
   $ hg prune 1
-  abort: cannot touch public changesets: 7c3bad9141dc
+  abort: cannot prune public changesets: 7c3bad9141dc
   (see 'hg help phases' for details)
   [255]
   $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
@@ -390,12 +389,12 @@
   4	feature-A: a nifty feature - test
   0	: base - test
 
-phase change turning obsolete changeset public issue a bumped warning
+phase change turning obsolete changeset public issues a phase divergence warning
 
   $ hg phase --hidden --public 99833d22b0c6
   1 new phase-divergent changesets
 
-all solving bumped troubled
+all solving phase-divergent
 
   $ glog
   @  6:47d52a103155@default(draft) another feature that rox
@@ -409,7 +408,6 @@
   $ hg evolve --any --traceback --phase-divergent
   recreate:[6] another feature that rox
   atop:[5] another feature (child of ba0ec09b1bab)
-  computing new diff
   committed as aca219761afb
   working directory is now at aca219761afb
   $ glog
@@ -429,7 +427,7 @@
   @@ -3,1 +3,1 @@
   -Zwei
   +deux
-  $ hg log -r 'phasedivergent()' # no more bumped
+  $ hg log -r 'phasedivergent()' # no more phase-divergent
 
 test evolve --all
   $ sed -i'' -e s/deux/to/ main-file-1
@@ -1000,8 +998,8 @@
   o  0:07c1c36d9ef0@default(draft) a0
   
 
-Possibility to select what trouble to solve first, asking for bumped before
-divergent
+Possibility to select what instability to solve first, asking for
+phase-divergent before content-divergent
   $ hg up -r "desc('a1__')"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg revert -r d952e93add6f --all
@@ -1040,8 +1038,8 @@
   o  0	: a0 - test
   
 
-Now we have a bumped and an unstable changeset, we solve the bumped first
-normally the unstable changeset would be solve first
+Now we have a phase-divergent and an orphan changeset, we solve the
+phase-divergent first. Normally the orphan changeset would be solved first
 
   $ hg log -G
   @  11	: add new file bumped - test
@@ -1061,7 +1059,6 @@
   $ hg evolve -r "desc('add new file bumped')" --phase-divergent
   recreate:[11] add new file bumped
   atop:[10] a2
-  computing new diff
   committed as a8bb31d4b7f2
   working directory is now at a8bb31d4b7f2
   $ hg evolve --any
@@ -1080,7 +1077,7 @@
   o  0:07c1c36d9ef0@default(public) a0
   
 
-Check that we can resolve troubles in a revset with more than one commit
+Check that we can resolve instabilities in a revset with more than one commit
   $ hg up b88539ad24d7 -C
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ mkcommit gg
@@ -1377,11 +1374,11 @@
   $ mkcommit c5_
   created new head
   $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
-  abort: touch will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
   $ hg prune '98e171e2f272::0d9203b74542'
-  abort: touch will orphan 1 descendants
+  abort: prune will orphan 1 descendants
   (see 'hg help evolution.instability')
   [255]
   $ hg prune '0ef9ff75f8e2::'
@@ -1604,7 +1601,7 @@
   adding a
   adding b
   adding c
-Lets create a merge commit so that we can create orhpan merge later:
+Let's create a merge commit so that we can create orphan merge later:
   $ hg up 1 -q
   $ echo feature > f
   $ hg ci -Am "added feature f"
@@ -1651,7 +1648,7 @@
   
 
 To check `lastsolved` contain right value after completion of orphan-merge
-resolution there should be one more trouble to be evolved; lets create one:
+resolution there should be one more instability to be evolved; lets create one:
   $ hg up 1 -q
   $ echo d > d
   $ hg ci -Am "added d"