equal
deleted
inserted
replaced
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 |
|
4 $ . $TESTDIR/testlib/common.sh |
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 = |
|
11 > [extensions] |
|
12 > evolve = |
9 > EOF |
13 > EOF |
10 |
14 |
11 Setting up a public repo |
15 Setting up a public repo |
12 ------------------------ |
16 ------------------------ |
13 |
17 |
29 ---------------------------------------- |
33 ---------------------------------------- |
30 |
34 |
31 $ hg clone -U public private |
35 $ hg clone -U public private |
32 $ cd private |
36 $ cd private |
33 $ cat >> .hg/hgrc <<EOF |
37 $ cat >> .hg/hgrc <<EOF |
34 > [extensions] |
|
35 > evolve = $evolvepath |
|
36 > [ui] |
38 > [ui] |
37 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n |
39 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n |
38 > [phases] |
40 > [phases] |
39 > publish = false |
41 > publish = false |
40 > EOF |
42 > EOF |