On 07.01.2010 17:44, Steve Borho wrote: > On Thu, Jan 7, 2010 at 10:37 AM, Adrian Buehlmann <[email protected]> wrote: >> On 07.01.2010 15:53, Steve Borho wrote: >>> On Thu, Jan 7, 2010 at 4:28 AM, Adrian Buehlmann <[email protected]> wrote: >>>> On 07.01.2010 07:21, Steve Borho wrote: >>>>> I think I'm done refactoring the visual diff subsystem on the default >>>>> branch. I would like for people to try it out and provide feedback. >>>> >>>> Starting with >>>> >>>> changeset: 5411:04cbc9485753 >>>> user: Steve Borho <[email protected]> >>>> date: Wed Jan 06 23:01:10 2010 -0600 >>>> summary: hglib: further fixup logic for hg-1.4 extdiff configurations >>>> >>>> http://bitbucket.org/tortoisehg/stable/changeset/04cbc9485753/ >>>> >>>> if I try to do a visual diff in hgtk log, I just get the error box >>>> >>>> http://bitbucket.org/abuehl/thg-abuehl/downloads/visdiff-error-using-04cbc9485753.PNG >>>> >>>> from kdiff3 complaining about failing to open files. >>>> >>>> Using the parent of 04cbc9485753 (3ee74d16161b) it works fine. >>>> >>>> I'm on Windows 7 Ultimate 64bit. >>> >>> Can you send your kdiff extdiff config? >> >> Might well be that I have stupid settings in there. >> >> In C:\users\adi\Mercurial.ini I see ('adi' is my login name): >> >> <snip> >> [extdiff] >> cmd.vdiff = C:\Program Files\TortoiseHg\kdiff3 >> #opts.vdiff = $parent1 $child $parent2 >> </snip> >> >> [extdiff] in C:\Program Files\TortoiseHg\Mercurial.ini is empty. >> > > I want old working configurations to keep working. I'll figure out what's up. > FWIW: you can work around this in the short term by commenting out cmd.vdiff
If I do that, I get a window with title "TortoiseHg" and text: <paste> No diff tool found No visual diff tools were detected </paste> ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
