Re: Integrating kdiff3 with svn command-line client [SOLVED]
From: Philippe Andersson <pan_at_iba-group.com>
Date: Thu, 10 Jul 2008 11:29:10 +0200
Ok, I found the solution.
It looks like "svn merge" now specifies the temp file to use as output
Those are the parameters as they are received by the wrapper:
# BASE THEIRS MINE RESULT
Passing the value of $ARGV as "-o" parameter to kdiff3 did the trick.
John Peacock wrote:
-- *Philippe Andersson* Unix System Administrator IBA Particle Therapy | Tel: +32-10-475.983 Fax: +32-10-487.707 eMail: pan_at_iba-group.com <http://www.iba-worldwide.com> The contents of this e-mail message and any attachments are intended solely for the recipient (s) named above. This communication is intended to be and to remain confidential and may be protected by intellectual property rights. Any use of the information contained herein (including but not limited to, total or partial reproduction, communication or distribution of any form) by persons other than the designated recipient(s) is prohibited. Please notify the sender immediately by e-mail if you have received this e-mail by mistake and delete this e-mail from your system. E-mail transmission cannot be guaranteed to be secure or error-free. Ion Beam Applications does not accept liability for any such errors. Thank you for your cooperation.
This is an archived mail posted to the Subversion Users mailing list.