comparison tests/test-evolve-split.t @ 5824:73573aec18f7 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:40:20 +0800
parents a1dad44fe3da
children d919851981d4
comparison
equal deleted inserted replaced
5758:552efcc2cc30 5824:73573aec18f7
1 Check that evolve shows error while handling split commits 1 Check that evolve shows error while handling split commits
2 -------------------------------------- 2 --------------------------------------
3 $ cat >> $HGRCPATH <<EOF 3 $ cat >> $HGRCPATH <<EOF
4 > [defaults]
5 > amend=-d "0 0"
6 > fold=-d "0 0"
7 > [web]
8 > push_ssl = false
9 > allow_push = *
10 > [phases]
11 > publish = False
12 > [diff]
13 > git = 1
14 > unified = 0
15 > [ui] 4 > [ui]
16 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n 5 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
17 > [extensions] 6 > [extensions]
18 > EOF 7 > EOF
19 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 8 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH