Mercurial > hg
view tests/test-mq-qdelete @ 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 | 04b2c1e27c26 |
children | 37eedb1a1848 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew a hg qnew b hg qnew c hg qdel hg qdel c hg qpop hg qdel c hg qseries ls .hg/patches hg qpop hg qdel -k b ls .hg/patches hg qdel -r a hg qapplied hg log --template '{rev} {desc}\n' hg qnew d hg qnew e hg qnew f hg qdel -r e hg qdel -r qbase:e hg qapplied hg log --template '{rev} {desc}\n'