Mercurial > hg > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 6145:29bc269bcc96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: source common.sh in more tests
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 20 Sep 2021 20:28:49 +0300
parents 7204178ac04a
children 6b7ef731141b
comparison
equal deleted inserted replaced
6144:51249e4e9025 6145:29bc269bcc96
16 16
17 This test contains cases when `hg evolve` is doing content-divergence resolution. 17 This test contains cases when `hg evolve` is doing content-divergence resolution.
18 18
19 Setup 19 Setup
20 ===== 20 =====
21
22 $ . $TESTDIR/testlib/common.sh
21 23
22 $ cat >> $HGRCPATH <<EOF 24 $ cat >> $HGRCPATH <<EOF
23 > [phases] 25 > [phases]
24 > publish = False 26 > publish = False
25 > [alias] 27 > [alias]
26 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" 28 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
27 > [experimental] 29 > [experimental]
28 > evolution.allowdivergence = True 30 > evolution.allowdivergence = True
29 > [extensions] 31 > [extensions]
32 > evolve =
30 > EOF 33 > EOF
31 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
32 34
33 $ hg init abortrepo 35 $ hg init abortrepo
34 $ cd abortrepo 36 $ cd abortrepo
35 $ echo ".*\.orig" > .hgignore 37 $ echo ".*\.orig" > .hgignore
36 $ hg add .hgignore 38 $ hg add .hgignore