On 09.01.2010 05:57, Steve Borho wrote: > Hello folks, > > I've received unsolicited advice from a few users that they would > prefer if we packaged TortoiseMerge in lieu of Kdiff3. This is a > feasible choice as it is licensed under the GPL v2 and is available as > a separate statically linked executable. It's even a bit smaller than > Kdiff3. They seem to have similar feature sets. Kdiff3 probably has > an edge in features while TortoiseMerge is probably easier on the > eyes. TortoiseMerge is also _much_ more familiar for people moving > from TCVS or TSVN.
The "people moving from TCVS or TSVN" argument is a very strong one. Side note: Unless you are a GPL afficionado, the GPL license doesn't really matter here since TortoiseHg doesn't link GPL'ed parts with the diff/merge tools. All it does is starting a process for it. So it's just command line usage. All you need is permission to distribute and install it. There are a whole plethora of non-GPL licenses which allow that (even closed source ones). > Another reason I am considering this is the I've always felt a bit > guilty packing Kdiff3.exe all alone in our installer without all of > the other pieces one normally gets if you download and install it > yourself: shell integration, help text, etc. Our version is also > quite old (>2yr), since newer releases tripled in size I have chosen > not to update it. > > If you would like to try TortoiseMerge, you can download it from here: > > http://sourceforge.net/projects/tortoisesvn/files/Tools/ > > Get the 1.6.4/TortoiseDiff-1.6.4.zip package. unzip it, then copy > TortoiseMerge.exe into your system path (the TortoiseHg install > directory is a handy place). If you have a recent unstable nightly > build, all you have to do after that is select 'tortoisemerge' from > the drop-down list for 'Visual Diff Command:' in the global settings > tool (on the TortoiseHg tab) and save. > > I'm curious what others think. Just tried it, diffing some files. Works fine. If I should be missing kdiff3 in the future, I can easily download and install it myself. I'm fine with switching to bundling TortoiseMerge instead of kdiff3. In short: +1 ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
