Mercurial > hg
view tests/test-add @ 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 | 883d887c6408 |
children | 7c36a4fb05a3 |
line wrap: on
line source
#!/bin/sh hg init a cd a echo a > a hg add -n hg st hg add hg st echo b > b hg add -n b hg st hg add b || echo "failed to add b" hg st echo % should fail hg add b hg st hg ci -m 0 echo % should fail hg add a echo aa > a hg ci -m 1 hg up 0 echo aaa > a hg ci -m 2 hg merge hg st echo % should fail hg add a hg st hg ci -m merge echo % issue683 hg rm a hg st echo a > a hg add a hg st hg add c && echo "unexpected addition of missing file" echo c > c hg add d c && echo "unexpected addition of missing file" hg st