Mercurial > hg
view tests/test-export @ 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 | 504dee0abeac |
children | eae1767cc6a8 |
line wrap: on
line source
#!/bin/sh hg init repo cd repo touch foo hg add foo for i in 0 1 2 3 4 5 6 7 8 9 10 11; do echo "foo-$i" >> foo hg ci -m "foo-$i" -d "0 0" done for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do echo "# foo-$out.patch" hg export -v -o "foo-$out.patch" 2:tip done