[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TSVN 1.3.2 & external Merge tool (Araxis) with /readonly parameter ...

From: Panu Outinen <panu_at_vertex.fi>
Date: 2006-03-31 15:36:16 CEST

Hi!

First thank you for this great tool that gets improving all the time!!

Version used: TortoiseSVN-1.3.2.5840-svn-1.3.0.msi
Araxis v6.5 set as diff and merge tool.

One of our developers run to this recently as he tried the "Check for
modifications" and then "Check repository" and then double-clicking
the green rows
=> Araxis Merge Command Line Compare Utility v6.5 comes up showing
the available options.

I checked the current source code:
r4602:
"Pass the /readonly parameter to TortoiseMerge when diffing with remote files.
This fixes issue #178."

This fix seems to have introduced now a problem with some external
Merge tools as this additional command line parameter '/readonly' is
non-existant at least in Araxis v6.5 !

Regards,

   - Panu

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Mar 31 15:48:53 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.