On 14.01.2014 13:44, Lübbe Onken wrote:
> 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?
It all depends on what information is available at the time. And of
course if that information is available without an extra round trip to
the repository.
> 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 :))
>
> 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" :)
The name with the "merge-left.rXXX" and "merge-right.rXXX" is actually
part of the filename a merge conflict creates. It's the svn library that
creates those files and TSVN just uses those filenames to create the
view titles for the merge tool.
quotes are added around every parameter. That's why you get double
quotes if you add quotes yourself.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3071605
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-14 20:41:36 CET