tests/test-merge9

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

# test that we don't interrupt the merge session if
# a file-level merge failed

hg init repo
cd repo

echo foo > foo
echo a > bar
hg ci -Am 'add foo' -d '0 0'

hg mv foo baz
echo b >> bar
echo quux > quux1
hg ci -Am 'mv foo baz' -d '0 0'

hg up -qC 0
echo >> foo
echo c >> bar
echo quux > quux2
hg ci -Am 'change foo' -d '0 0'

# test with the rename on the remote side
HGMERGE=false hg merge
hg resolve -l

# test with the rename on the local side
hg up -C 1
HGMERGE=false hg merge

echo % show unresolved
hg resolve -l

echo % unmark baz
hg resolve -u baz

echo % show
hg resolve -l

echo % re-resolve baz
hg resolve baz

echo % after
hg resolve -l

echo % resolve all
hg resolve

echo % after
hg resolve -l

true