On Thu, Jan 28, 2010 at 6:15 AM, Neal Becker <ndbeck...@gmail.com> wrote: > Steve Borho wrote: > >> On Wed, Jan 27, 2010 at 9:35 PM, Greg Ward >> <g...@gerg.ca> wrote: >>> On Wed, Jan 27, 2010 at 8:26 PM, Steve Borho >>> <st...@borho.org> wrote: >>>> When 0.10 is launched, we need for the tortoisehg packages on Linux to >>>> install contrib/mergetools.ini into the site-wide HGRCPATH (typically >>>> something like /etc/mercurial) and probably renamed as >>>> thgmergetools.rc so that the visual diff system can work "out of the >>>> box'. >>> >>> Debian/Ubuntu and (I think) Fedora/Red Hat packages already install >>> Mercurial's contrib/mergetools.rc to >>> /etc/mercurial/hgrc.d/mergetools.rc, which works great. (Neal, can >>> you confirm my claim about the Fedora package?) >>> >>> Is thg's mergetools.ini different from/better than hg's mergetools.rc? >>> If so, why not push the improvements upstream to hg? If not, why not >>> stick with what is already installed by most Unix/Linux distributors? >> >> Ours is a superset of Mercurial's. I plan to back-port the >> differences to Mercurial, but it requires major hacking in extdiff and >> it hasn't risen to the top of my TODO list. I'm holding out faint >> hope that some Mercurial hacker will get addicted to the improvements >> in thg 0.10 and back port them to extdiff for me. >> >> -- >> Steve Borho > If it's not compatible with plain hg, it can't be installed as > /etc/mercurial/hgrc.d/mergetools.rc
1) I suggested naming it thgmergetools.rc so we do not overwrite their file 2) ours is a superset, it adds entries that thg reads but mercurial does not There's no adverse side-effects to installing the file. -- Steve Borho ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
