Command line paramters for extenal merge tool

Hi Folks,

depending on the location from which the external merge tool is called, the
contents of the %bname,%mname and %tname are different.

From the explorer context menu, the %*name variables contain the name of
the file in the directory without path.
e.g. %tname variable contains "<Filename-right-with-revision-number>" and
no quotes

From the merge dialog (resolve conflicts), the %*name variables contain the
basic name of the file, plus some explanation text in quotes.
e.g. the %tname variable contains "<base-filename-without-revision-number>:
File in repository", including the quotes

Why is this different?

I tried to set up a command line for ExamDiff Pro. If I use:
/dn1:"Theirs: %tname"
this works if called from the context menu, but it fails from the merge
dialog, because the result then contains nested double quotes.

If I just use
/dn1:%tname
it works in both cases, but I don't have the "Theirs: " prefix.

See screenshot: (please disregard the "Zusammengeführt" in the second case,
wrong command line parameter on my part :))

[image: Inline-Bild 3]

I have no problem doing it one way or the other, but how about doing it the
same in both cases?
* Are the revision numbers not available in the second case?
* Is the basic name not available in the first case?

How about doing the following:
* alway return %bname,%mname,%tname like from the explorer context menu
(with merge-left, merge-right, revision number and working).
* add an option %fname that just returns the basic file name without any
extras. This would allow the users to assemble captions like the second on
their own.

It's a bit confusing for people to see a file named "-right" in the
leftmost window of a tool at the left side of a file named "-left" :)

Cheers
- Lübbe

--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3071586
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].