tests/test-evolve-phase-divergence.t
branchmercurial-4.5
changeset 4362 8bd60e09dfb4
parent 4360 522abf1d70b7
child 4363 a2fdbece7ce1
child 4513 d70db7e455dc
--- a/tests/test-evolve-phase-divergence.t	Mon Dec 24 17:47:29 2018 +0100
+++ b/tests/test-evolve-phase-divergence.t	Tue Jan 22 12:55:09 2019 -0500
@@ -888,7 +888,7 @@
   1 new phase-divergent changesets
 
   $ hg glog -r f3794e5a91dc::
-  @  24:e450d05b7d27 added g
+  @  24:390acb97e50a added f
   |   () draft
   | o  23:428f7900a969 added g
   | |   () public
@@ -901,14 +901,14 @@
   ~
 
   $ hg evolve --list
-  e450d05b7d27: added g
+  390acb97e50a: added f
     phase-divergent: 21ae52e414e6 (immutable precursor)
     phase-divergent: 428f7900a969 (immutable precursor)
   
 Resolving phase divergence using `hg evolve`
 
   $ hg evolve --phase-divergent --all
-  recreate:[24] added g
+  recreate:[24] added f
   atop:[23] added g
   rebasing to destination parent: 21ae52e414e6
   computing new diff