Re: [TSVN] external merge tools - how?

Ivan-Assen Ivanov wrote:

> Hello,
>
> I'm trying to run an external merge tool from TortoiseSVN.
> I enter the path to Araxis's merge.exe or Perforce's p4winmrg.exe,
> and when I select "Edit Conflicts", Tortoise launches them, but
> apparently without parameters. What should I add on the command line
> for it to work?
>
> Assen

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.

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.

--
Rob.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org