Mercurial > evolve

comparison tests/test-evolve-abort-phasediv.t @ 5637:eed42a183d46 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 19:33:42 +0800
parents 5cd7d16b8733 b2de5825e5ca
children c2c85576ddfb
comparison
equal deleted inserted replaced
5636:3f9ef377e670 5637:eed42a183d46
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
13 #testcases abortcommand abortflag
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
23 #if abortflag
24 $ cat >> $HGRCPATH <<EOF 22 $ cat >> $HGRCPATH <<EOF
25 > [alias] 23 > [alias]
26 > abort = evolve --abort 24 > abort = evolve --abort
27 > EOF 25 > EOF
28 #endif
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