view tests/test-extdiff @ 4083:33c369afec94

Unified *_rcpath so the interface is similar across operating systems Changed os_rcpath to combine system_rcpath and user_rcpath. Changed system_rcpath and user_rcpath to both return a list of paths to add to the combined rcpath for both Windows NT and other platforms.
author Shane Holloway <shane.holloway@ieee.org>
date Wed, 14 Feb 2007 15:20:06 -0700
parents 797c6e70092b
children 2be225ea5722
line wrap: on
line source

#!/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"