diff tests/test-evolve-list.t @ 3106:a867d59ea97a mercurial-4.3

test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 20:04:13 +0200
parents 945a0989e41b
children 85cdce113c2c
line wrap: on
line diff
--- a/tests/test-evolve-list.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-list.t	Fri Oct 20 20:04:13 2017 +0200
@@ -17,7 +17,7 @@
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a >> a && hg ci --amend -m a
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve --list
   d2ae7f538514: b
     unstable: cb9a9f314b8b (obsolete parent)
@@ -34,7 +34,7 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg evolve --list
   88cc282e27fc: ab
     bumped: cb9a9f314b8b (immutable precursor)
@@ -64,7 +64,7 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg evolve --list
   c882616e9d84: b
     divergent: a922b3733e98 (draft) (precursor d2ae7f538514)