view tests/test-nested-repo @ 5242:9cd6578750b9

improve error message for 'hg merge' when repo already at branchtip
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 25 Aug 2007 11:30:11 +0200
parents c7e8fe11f34a
children
line wrap: on
line source

#!/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