diff tests/test-evolve-phase-divergence.t @ 4489:818e8190e867

branching: merge with stable

This merge happens before the large test consolidation on stable.

--- a/tests/test-evolve-phase-divergence.t	Sun Apr 07 20:00:16 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Wed Apr 10 16:40:58 2019 +0200
@@ -1,11 +1,15 @@
 ** Test for handling of phase divergent changesets by `hg evolve` **
 ====================================================================
 
+  $ . $TESTDIR/testlib/common.sh
+
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"
   > [extensions]
   > rebase =
+  > [extensions]
+  > evolve =
   > EOF
 
 Setting up a public repo
@@ -33,8 +37,6 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd private
   $ cat >> .hg/hgrc <<EOF
-  > [extensions]
-  > evolve = $evolvepath
   > [ui]
   > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
   > [phases]