diff tests/test-evolve-list.t @ 4516:f54bb6eaf5e6 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:44:53 +0200
parents a2fdbece7ce1 3caa4a459439
children
line wrap: on
line diff
--- a/tests/test-evolve-list.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-list.t	Thu Apr 11 22:44:53 2019 +0200
@@ -17,7 +17,6 @@
   $ 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
   $ hg evolve --list
   d2ae7f538514: b
     orphan: cb9a9f314b8b (obsolete parent)
@@ -34,7 +33,6 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
   $ hg evolve --list
   88cc282e27fc: ab
     phase-divergent: cb9a9f314b8b (immutable precursor)
@@ -64,7 +62,6 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
   $ hg evolve --list
   c882616e9d84: b
     content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)