Re: [TSVN] external merge tools - how?

Rob Davies wrote:

> Not sure as to the solution to this one, but I would suggest it is down
> to TortoiseMerge taking the file params as, e.g., "/base:<filename>"
> rather than just "<filename>". TortoiseSVN outputs to cater for this
> requirement (I think), but as a result spews out something neither
> P4Merge nor Araxis understand.

Wrong. TSVN calls TortoiseMerge this way, but not the external merge
tools. If it would do that, then the option to use an external merge
tool would be absolutely useless!

> Not sure how you'd go about stripping the "/base:", "/theirs:", etc. off
> on the command line manually - I think you'd need TortoiseSVN to do it.

You don't need to. An example is shown in the tooltip of the editbox
where the external merge tool is set.

e.g.

"c:\program files\araxis\p4diff.exe" %base %mine
or
"c:\program files\araxis\p4merge.exe" %merged %theirs %mine %base

the strings with the "%" in front are replaces with the corresponding
file path.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 9 16:06:50 2004