view tests/test-nested-repo @ 6385:0d4e068e9e52

commit: when committing the results of a merge, it's all or nothing

Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do.  This fixes issue 1049.

#!/bin/sh

hg init a
cd a
hg init b
echo x > b/x

echo '# should print nothing'
hg add b
hg st

echo '# should fail'
hg st b/x
hg add b/x

echo '# should fail'
hg add b b/x
hg st

echo '# should arguably print nothing'
hg st b

echo a > a
hg ci -Ama a

echo '# should fail'
hg mv a b
hg st