tests/test-evolve-phase-divergence.t
branchmercurial-4.7
changeset 4359 2cbb9914d227
parent 4202 f555039d1a08
parent 4340 5300be965515
child 4360 522abf1d70b7
child 4512 7a779a288793
--- a/tests/test-evolve-phase-divergence.t	Mon Dec 24 17:47:27 2018 +0100
+++ b/tests/test-evolve-phase-divergence.t	Tue Jan 22 12:54:43 2019 -0500
@@ -893,7 +893,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
@@ -906,14 +906,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