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

[TSVN] Re: TMerge params. Was external diff program config

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-11-01 21:57:52 CET

SteveKing wrote:
> Simon Large wrote:
>> SteveKing wrote:
>>
>>> You can already do that, it's just not documented since I didn't
>>> know that other diff tools can do this too ;)
>>
>>
>> I think the TMerge docs _and_ the little parameter summary dialog box
>> are way out of date, as I am fairly sure you have added several new
>> parameters in the last 2-3 months. There is a bunch of them in
>> TortoiseMerge.cpp, but I am not exactly sure what they all mean.
>
> You're misleaded here a little bit. It has nothing to do with
> TortoiseMerge, but how TortoiseSVN (TortoiseProc.exe) calls the
> external diff program. It does this automatically (passing the names
> of the files with additional information) for TortoiseMerge, but it
> can do that for other diff programs too. It's just not documented
> (yet).

I should have started a separate thread as it's not really related to
this one. TMerge does have more parameters than are documented. Like
patchpatch, reversedpatch. You document most of the parameters in case
anyone should want to call TMerge standalone. Are the others just for
'internal use' with TortoiseProc.exe?

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Nov 1 22:11:59 2004

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.