view tests/test-nested-repo @ 3509:9de0e64545a3

Test that we notice the empty files from the second parent during a merge

This didn't work with 0.9.1, but was fixed by 05257fd28591.

#!/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 --all
echo '# should print nothing'
hg st b