[TSVN] Re: Possible bug: external diff program called with incorrect parameters.

Tim Robinson wrote:
> 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.

If you right click to get the context menu you will see that double
click does a diff. You need to select 'Edit conflicts' from the context
menu. I'm not sure if diff is the correct default in that case, but you
can get the merge program to run.

> IIRC this was the same in the previous version I used (1.1.1) but I

If you thought there was a bug you should have reported it ;-)

> 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.

No, that change was introduced in 1.1.3. But several people have been
caught out by this, so the behaviour has now reverted to passing the
filenames if no parameters are specified.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org