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

Integrating kdiff3 with svn command-line client

From: Philippe Andersson <pan_at_iba-group.com>
Date: Wed, 09 Jul 2008 15:26:37 +0200

Hello list,

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.

Here is what already works:
- when a conflicting merge is detected, svn displays the following message:

taranis:~/wc/bidon/trunk$ svn merge --reintegrate
Conflict discovered in 'machin'.
Select: (p) postpone, (df) diff-full, (e) edit,
         (h) help for more options: l

- I type 'l' and this launches kdiff3, which opens with the expected 3
versions of the file (BASE, THEIRS, MINE).

- I use kdiff3 to resolve the conflicts and I save the resulting file (a
temp file whose name has been generated by my wrapper).

- When exiting kdiff3, the contents of the temp file is sent to stdout
(simply using "cat") as requested in the book, and the script exits with
a '0' return code. I can see the expected file contents being displayed
in my shell, then svn prints the following message:

Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
         (h) help for more options: r

- I press 'r' to signify that all conflicts have been resolved, upon
which svn proceeds with the actual merge:

--- Merging differences between repository URLs into '.':
U machin

Unfortunately, when I check the file contents post merge, it still
contains the ">>>>>>>" and "<<<<<<" strings typical of unresolved conflicts.

What am I doing wrong ?


Cheers. Bye.

Ph. A.

*Philippe Andersson*
Unix System Administrator
IBA Particle Therapy |
Tel: +32-10-475.983
Fax: +32-10-487.707
eMail: pan_at_iba-group.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-09 15:27:10 CEST

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

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