view tests/test-churn @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
parents f8feaa665319
children 78a17b77c5e7
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "churn=" >> $HGRCPATH

echo % create test repository
hg init repo
cd repo
echo a > a
hg ci -Am adda -u user1
echo b >> a
echo b > b
hg ci -Am addb -u user2
echo c >> a
echo c >> b
echo c > c
hg ci -Am addc -u user3

echo % churn all
hg churn
echo % churn up to rev 1
hg churn -r :1
echo % churn with aliases
cat > ../aliases <<EOF
user1 alias1
user3 alias3
EOF
hg churn --aliases ../aliases
echo % churn with column specifier
COLUMNS=40 hg churn