[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [TSVN] 1.1.3 Diff Bug

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2005-03-03 14:09:33 CET

Hi Matthew,

> I've just installed the latest Tortoisesvn 1.1.3 and when I
> do a Compare
> With Base
> on a modified file using WinMerge as the external diff program, it
> brings up WinMerge
> but fails to pass the 2 files as parameters. Version 1.1.2
> used to work
> fine with WinMerge.

Check the diff / merge settings if the %base and %mine parameters are there.
Older versions of TortoiseSVN used to append them automatically. TortoiseSVN
1.1.3 doesn't do this anymore, because the default may be right for one diff
tool and wrong for the other.

- Lübbe

  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Mar 3 14:10:43 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.