8 This test contains cases when `hg evolve` is doing phase-divergence resolution.

     8 This test contains cases when `hg evolve` is doing phase-divergence resolution.

     9 

     9 

    10 Setup

    10 Setup

    11 =====

    11 =====

    12 

    12 

    14   $ cat >> $HGRCPATH <<EOF

    13   $ cat >> $HGRCPATH <<EOF

    15   > [phases]

    14   > [phases]

    16   > publish = False

    15   > publish = False

    17   > [alias]

    16   > [alias]

    18   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"

    17   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"

    19   > [extensions]

    18   > [extensions]

    20   > EOF

    19   > EOF

    21   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

    20   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

    22 

    21 

    24   $ cat >> $HGRCPATH <<EOF

    22   $ cat >> $HGRCPATH <<EOF

    25   > [alias]

    23   > [alias]

    26   > abort = evolve --abort

    24   > abort = evolve --abort

    27   > EOF

    25   > EOF

    29 

    26 

    30   $ hg init abortrepo

    27   $ hg init abortrepo

    31   $ cd abortrepo

    28   $ cd abortrepo

    32   $ echo ".*\.orig" > .hgignore

    29   $ echo ".*\.orig" > .hgignore

    33   $ hg add .hgignore

    30   $ hg add .hgignore