view tests/test-inotify-issue1371 @ 7785:660c8dd44060

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

"$TESTDIR/hghave" inotify || exit 80

hg init 

touch a b c d e f

echo "[extensions]" >> $HGRCPATH
echo "inotify=" >> $HGRCPATH
echo inserv1

echo % inserve
hg inserve -d --pid-file=hg.pid 2>&1
cat hg.pid >> "$DAEMON_PIDS"

hg ci -Am m


# let the daemon finish its stuff
sleep 1

#Need to test all file opperations
hg rm a
rm b
echo c >> c
touch g
hg add g
hg mv e h
hg status

sleep 1
echo "Are we able to kill the service? if not, the service died on some error"
kill `cat hg.pid`