tests/test-extdiff
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 14 Jun 2007 12:54:06 +0200
changeset 4583 11cf78983961
parent 3751 797c6e70092b
child 5110 2be225ea5722
permissions -rwxr-xr-x
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color.

#!/bin/sh

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

hg init a
cd a
echo a > a
hg add
hg extdiff -o -r $opt

echo "[extdiff]" >> $HGRCPATH
echo "cmd.falabala=echo" >> $HGRCPATH
echo "opts.falabala=diffing" >> $HGRCPATH

hg falabala

hg help falabala

hg ci -d '0 0' -mtest1

echo b >> a
hg ci -d '1 0' -mtest2

hg falabala -r 0:1

# test diff during merge
hg update 0
echo b >> b
hg add b
hg ci -m "new branch" -d '1 0'
hg update -C 1
hg merge tip
hg falabala || echo "diff-like tools yield a non-zero exit code"