1 ** Test for handling of phase divergent changesets by `hg evolve` **

     1 ** Test for handling of phase divergent changesets by `hg evolve` **

     2 ====================================================================

     2 ====================================================================

     3 

     5 

     4   $ cat >> $HGRCPATH <<EOF

     6   $ cat >> $HGRCPATH <<EOF

     5   > [alias]

     7   > [alias]

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

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

     7   > [extensions]

     9   > [extensions]

     8   > rebase =

    10   > rebase =

     9   > EOF

    13   > EOF

    10 

    14 

    11 Setting up a public repo

    15 Setting up a public repo

    12 ------------------------

    16 ------------------------

    13 

    17 

    31   $ hg clone public private

    35   $ hg clone public private

    32   updating to branch default

    36   updating to branch default

    33   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    37   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    34   $ cd private

    38   $ cd private

    35   $ cat >> .hg/hgrc <<EOF

    39   $ cat >> .hg/hgrc <<EOF

    38   > [ui]

    40   > [ui]

    39   > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n

    41   > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n

    40   > [phases]

    42   > [phases]

    41   > publish = false

    43   > publish = false

    42   > EOF

    44   > EOF