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

Re: [TSVN] Support for external diff program in nightly build 2371 broken

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-09 18:24:21 CET

At 18:04 09/01/2005 +0100, you wrote:

>Any diff with TortoiseMerge works as expected, but other external diff
>programs (I tried with KDiff3 and WinMerge) don't get the right parameters.
>
>Or do I have to do more now than just specifing the path to the executable
>as it worked in build 2205?

It turns out that you do. In 2216, this got changed so that you have to
add the %base and %mine parameter place-holders to the command string yourself.

Clearly there is room for improvement in the settings dialog here, which
could warn you if these were missing.

I don't know the rationale for this change - I daresay it's in the list
archives, if you look back.

Cheers,

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Jan 9 18:25:05 2005

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