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

Re: [TSVN] Can't make "%bname" and friends to work

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-12-30 18:14:41 CET

Milen A. Radev wrote:
> I'm using KDiff3 for diff and merge programme. Recently I found that
> KDiff3 accepts parameters for the titles of the different files
> involved. So I changed the command line in "Settings | Diff/Merge |
> Merge program | External" to pass %bname, %yname and %tname (I'm not
> sure KDiff3 supports title for the merged file - %mname). I tested it
> and it appears that those parameters are not passed actually. The same
> parameters (well %bname and %yname only) work nicely in the Diff
> command line. So I started looking in the code. I found the
> "CUtils::StartExtMerge" method and that in the "TortoiseProc.cpp" file
> (in "conflicteditor" region ) it is called like that (line 1096):
> CUtils::StartExtMerge(base, theirs, mine, merge);
> So no titles are passed. Is it a bug? Or am I overlooking something important?

What titles do you want to pass there? The titles are used to provide
additional information, e.g. "working copy", "revision xxx", ... - but
in that case there is no such information. The files simply are mine,
theirs, yours, merged. TortoiseMerge shows such a title automatically if
no title information is passed, and I think other programs should too.


   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 Dec 30 18:15:19 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.