view tests/test-inotify-lookup @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges.

Fixes issue1533.

#!/bin/sh

"$TESTDIR/hghave" inotify || exit 80

hg init
echo "[extensions]" > .hg/hgrc
echo "inotify=" >> .hg/hgrc
hg inserve -d --pid-file .hg/inotify.pid

echo a > a
hg ci -Aqm0
hg co -q null
hg co -q
hg st
cat a

kill `cat .hg/inotify.pid`