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

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
of the merge. Not sure cat'ing on stdout is still required.

Those are the parameters as they are received by the wrapper:

# BASE THEIRS MINE RESULT
/tmp/tmp .svn/tmp/tempfile.tmp machin .svn/tmp/tempfile.28.tmp

Passing the value of $ARGV[3] as "-o" parameter to kdiff3 did the trick.

HTH

Cheers. Bye.

Ph. A.

John Peacock wrote:
> Philippe Andersson wrote:
>> I'm struggling for 2 days now with the integration of kdiff3 with the
>> "svn" command-line client (version 1.5.0). As recommended by the good
>> book, I've written a wrapper script around kdiff3, but I can't get the
>> resulting file where it should be.
>
> Try this instead of writing your own:
>
> http://www.yolinux.com/TUTORIALS/src/svndiffwrapper.txt
>
> which works just fine (though I did patch it to attempt a merge first
> before asking everytime like it does now)...
>
> John
>
>
>

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


Received on 2008-07-10 11:29:51 CEST

This is an archived mail posted to the Subversion Users mailing list.