Hello,
On Thu, Oct 22, 2009 at 12:46 PM, Steve Borho <st...@borho.org> wrote:
> On Thu, Oct 22, 2009 at 7:56 AM, Sune Foldager <sune.folda...@me.com> wrote:
>> This is version one of the patch to enable full 3-way diff support in
>> visdiff,
>> compatible with the extdiff extension (and with code mostly from there).
>>(...)
>
> With it applied, visual diffs on linux always get a 'no files to diff' error.
Are you sure it wasn't broken by another rev - specifically,
071ea4834dc4 ? Visual diff for committed revs doesn't work for me
since then.
FWIW, the following small change seems to fix it for me, but I don't
know enough about extdiff to be sure.
Thanks,
Wagner
diff --git a/tortoisehg/hgtk/visdiff.py b/tortoisehg/hgtk/visdiff.py
--- a/tortoisehg/hgtk/visdiff.py
+++ b/tortoisehg/hgtk/visdiff.py
@@ -310,7 +310,7 @@
# if both --change and --rev is given, remove --rev in 3-way mode,
# and --change in normal mode
- if 'change' in opts and 'rev' in opts:
+ if 'change' in opts and opts.get('rev', None):
if '$parent2' in ''.join(diffopts):
del opts['rev']
else:
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
