Mercurial > hg
view tests/test-bad-extension @ 6522:2b181fb3a70a
use internal merge tool when specified for a merge-pattern in hgrc
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:21:53 +0300 |
parents | f8a86ea7521b |
children |
line wrap: on
line source
#!/bin/sh echo 'raise Exception("bit bucket overflow")' > badext.py abspath=`pwd`/badext.py echo '[extensions]' >> $HGRCPATH echo "gpg =" >> $HGRCPATH echo "hgext.gpg =" >> $HGRCPATH echo "badext = $abspath" >> $HGRCPATH echo "badext2 =" >> $HGRCPATH hg -q help help 2>&1 | python -c \ "import sys; sys.stdout.write(sys.stdin.read().replace('$abspath', '.../badext.py'))"