view tests/test-nested-repo @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
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