Mercurial > hg
view tests/test-mq-symlinks @ 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 | 95413879bac9 |
children | 49f34b43cf90 |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" symlink || exit 80 echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init hg qinit hg qnew base.patch echo a > a echo b > b hg add a b hg qrefresh $TESTDIR/readlink.py a hg qnew symlink.patch rm a ln -s b a hg qrefresh --git $TESTDIR/readlink.py a hg qpop hg qpush $TESTDIR/readlink.py a