On Sun, Jan 4, 2009 at 1:43 PM, Peer Sommerlund <[email protected]>wrote:
> On 04/01/2009, Steve Borho <[email protected]> wrote: >> >> On Fri, Dec 26, 2008 at 10:54 PM, Douglas Philips <[email protected]> wrote: >> >>> http://diffuse.sourceforge.net/ >>>> >>> >>> Oh, it is at 0.2.x? >>> I'd think replacing kdiff3 would take a lot more mature tool than that. >>> I was able to sell Mercurial at work because of TortoiseHG. Losing kdiff3 >>> for 0.2 of some unknown merge tool would make TortoiseHG look a lot >>> weaker... >> >> >> Kdiff3 is a better tool if it's installed separately, since if gives you >> documentation and context menu options for doing directory diffs, etc. To >> me, it would make more sense to package a diff/merge tool that used the >> native GUI libraries and served all the needs of Mercurial and TortoiseHg. >> The default Mercurial.ini would still support kdiff3 (diffmerge, p4merge, >> etc) if the user has installed it. >> > > I think that users should be allowed to pick the merge tool they want to > work with (I'm a fan of WinMerge - even though it only does 2-way-merge), so > in my mind the bundled merge tool should be a simple "just good enough" > application and the installer (or something similar) should autodetect the > merge tools already installed. I haven't looked into the details, but the > Mercurial merge tool configuration [1] could probably do most of this > integration. > The thgconfig dialog already has most of these smarts in it. The drop-down box for ui.merge is seeded with the merge tools defined in your Mercurial.ini file(s) that pass the hg built-in detection tests. So long as we include configuration for all those tools in the base installer, your favorite diff tool will show up in that drop-down list if it is installed. I want to repeat my initial sentiment, though. I don't know that diffuse is sufficiently stable/complete to be able to function in this role, but I think it should be a long-term goal of TortoiseHG to find such a native tool. -- Steve
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
