view tests/test-up-issue1456 @ 11346:e740f36cfb4b

tests: rename test-merge3 to test-add-remove.

It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.

#!/bin/sh

rm -rf a
hg init a
cd a

echo foo > foo
hg ci -qAm0
chmod +x foo
hg ci -m1
hg co -q 0
echo dirty > foo
hg up -c
hg up -q
cat foo
hg st -A

echo '% validate update of standalone execute bit change'
hg up -C 0
chmod -x foo
hg ci -m removeexec
hg up -C 0
hg up
hg st