[PATCH 1 of 2] filemerge: add support for multiple merge tool versions (RFC)

Yuya Nishihara yuya at tcha.org
Fri Jan 8 08:11:22 CST 2016


On Wed, 6 Jan 2016 07:57:16 +0100, Mathias De Maré wrote:
> On Tue, Dec 22, 2015 at 8:06 PM, Matt Mackall <mpm at selenic.com> wrote:
> > Another strategy would be to try running with the option and looking at
> > output/exit codes.
> 
> I looked into this and it seems it would add way too much complexity.
> The main reason not to add '--auto-merge' (if I read it correctly in the
> old threads) is concern about custom packages for CentOS 5 and 6 breaking.
> I could extend buildrpm (or dockerrpm) to create a file
> /etc/mercurial/hgrc.d/mergetools.centos[5,6].rc containing only the old
> arguments for Meld.

It seems the loading order of *.rc files is unstable.

> All other OSes would get the regular arguments (which
> we can change to add '--auto-merge'). I believe this would be an easier
> approach that does not introduce too much complexity.
> 
> Does this seem like a good approach?

Alternatively, you could add new key for meld with --auto-merge. For instance,
we have "kdiff3" and "kdiff3-noauto" in default configuration of TortoiseHg.


More information about the Mercurial-devel mailing list