Mercurial > evolve

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable This merge happens before the large test consolidation on stable.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 10 Apr 2019 16:40:58 +0200
parents 218fa7c1fe4b 2db0aca03a88
children 48e9169633ef
comparison
equal deleted inserted replaced
4488:6c0992ce05f7 4489:818e8190e867
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
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
36 > [extensions]
37 > evolve = $evolvepath
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