view tests/test-issue619 @ 7329:fd4bf5269733

Do not abort with inotify extension enabled, but not supported by the system.

And remove the "native support is required" message which is generated at an
inappropriate location and is printed more than once when using 'hg status'.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done