tests/test-nested-repo

localrepo.update: abort if outstanding merges, instead of warn/return 1

#!/bin/sh

hg init a
cd a
hg init b
echo x > b/x
echo '# should print nothing'
hg st
echo '# should print ? b/x'
hg st b/x

hg add b/x

echo '# should print A b/x'
hg st
echo '# should forget b/x'
hg revert
echo '# should print nothing'
hg st b