diff tests/test-evolve-phase.t @ 4552:0eb80259f9cb mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Apr 2019 03:55:11 +0200
parents a2fdbece7ce1
children 79bc0f1a832e
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Sat Apr 20 03:55:10 2019 +0200
+++ b/tests/test-evolve-phase.t	Sat Apr 20 03:55:11 2019 +0200
@@ -32,7 +32,6 @@
   [1] b
   $ echo b2>b
   $ hg amend
-  1 new orphan changesets
   $ hg evolve
   move:[2] c
   atop:[3] b
@@ -70,12 +69,11 @@
   [1] b
   $ echo b2 > a
   $ hg amend
-  1 new orphan changesets
 
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | *  2 - 13833940840c c (secret)
+  | o  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/