Mercurial > hg
view tests/test-manifest @ 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 | f11554a097c8 |
children | 7239e06e58e9 |
line wrap: on
line source
#!/bin/sh # Source bundle was generated with the following script. # # hg init # echo a > a # ln -s a l # hg ci -Ama -d'0 0' # mkdir b # echo a > b/a # chmod +x b/a # hg ci -Amb -d'1 0' hg init hg -q pull "$TESTDIR/test-manifest.hg" hg manifest hg manifest -v hg manifest --debug hg manifest -r 0 hg manifest -r 1 hg manifest -r tip echo % should fail hg manifest -r 2 hg manifest -r tip tip hg manifest tip