tests/test-extra-filelog-entry
author Mads Kiilerich <mads@kiilerich.com>
Tue, 10 Feb 2009 22:47:38 +0100
changeset 7785 660c8dd44060
parent 4531 b51a8138292a
permissions -rwxr-xr-x
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.

#!/bin/sh
#
# test for issue351

# Environement setup for MQ
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

#Repo init
hg init
hg qinit

echo b > b
hg ci -A -m foo
echo cc > b
hg qnew -f foo.diff
echo b > b
hg qrefresh
hg debugindex .hg/store/data/b.i