>Hi,
>
>Using 1.1.3 build 2502. I do "check for modifications" and see that the
>same file has been changed both by me and on the server. Double-click on
>the file and my external merge program is invoked.
>
>I configured the "merge program" setting with 3 parameters: %theirs %base
>%mine. However, when invoked, the %mine and %base both point to the base
>file; there is no way of getting "mine".
>
>IIRC this was the same in the previous version I used (1.1.1) but I managed
>to get round it by omitting all the parameters from the settings dialog and
>it passed all 3 filenames in. if I try this in 1.1.3 it doesn't pass any
>paraemeters at all.
This sounds very similar (exactly like?) what I was experiencing. I replaced
my diff program's
executable with a stub that dumped the arguments being passed to it by tsvn.
Under 1.1.2,
tsvn sent the correct arguments to it whether or not I had %mine %base in
the diff settings.
When I moved to 1.1.3, tsvn passed no arguments even if I put %mine %base in
the diff
settings. I've heard behavior has been reverted to 1.1.2 behavior because
the change in 1.1.3
was confusing people (like me ;-), but was there a bug in 1.1.3 as well?
Dave
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Feb 2 20:25:52 2005