Mercurial > hg
view tests/test-mq-qrename @ 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 | 82c9d1aac308 |
children | 05a682c8907d |
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 -mmqbase mqbase hg qrename mqbase renamed mkdir .hg/patches/foo hg qrename renamed foo hg qseries ls .hg/patches/foo mkdir .hg/patches/bar hg qrename foo/renamed bar hg qseries ls .hg/patches/bar hg qrename bar/renamed baz hg qseries ls .hg/patches/baz