[PATCH] Update win32 merge tools configuration
pascal.quantin at gmail.com
Wed Jan 21 00:18:56 CST 2009
2009/1/20 Ezra Smith <ezra.smith at bentley.com>:
> Pascal Quantin wrote:
>> I totally agree with you but unfortunately it is not possible to guess
>> the BComp.exe path from registry. You just have a key for BCompare.exe
>> but for VCS integration you need to call BComp.exe and not
>> There is a regkeyappend keyword but not a regkeyremove one.
>> If someone knows how to handle this, please keep me informed :)
> You can do it with a combination of regkey and regname. From my
> beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
unfortunately this will not work (I already tried it...). With this
configuration you get the path for BCompare.exe, not BComp.exe.
And BCompare.exe does not work properly with hg merge and extdiff (at
least according to my tests).
We would need soem kind of regremove parameter to remove BCompare.exe
and then do a regappend to add BComp.exe
>> 2009/1/18 Patrick Mézard <pmezard at gmail.com>:
>>> TK Soh a écrit :
>>>> On Sun, Jan 18, 2009 at 1:46 PM, Patrick Mézard <pmezard at gmail.com> wrote:
>>>>> Pascal Quantin a écrit :
>>>>>> # HG changeset patch
>>>>>> # User Pascal Quantin < pascal.quantin at gmail.com>
>>>>>> # Date 1232214700 -3600
>>>>>> # Node ID e9e5f6ea166494fe372defb6280e0d29727c9a42
>>>>>> # Parent 3cc74ee75b0d109d63df4d09d2eb2aa08ee36204
>>>>>> Update win32 merge tools configuration
>>>>>> Add WinMerge and Beyond Compare 3 to default merge tools configuration.
>>>>>> Fix TortoiseMerge configuration.
>>>>> In crew as 950484f05f16, thanks !
>>>> It's a little late for this comment, but hardcoding the executable
>>>> path for BC3 isn't a very good idea. Can it be determined by registry
>>>> settings like others?
>>> Right, I saw it but decided it was better than nothing until someone with BC3 (not me that is) comes up with a fix. Thanks for making it explicit.
>>> Patrick Mézard
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
More information about the Mercurial-devel