Hi Warren,
possibly not the answer you are looking for, but hav you tried http://kdiff3.sourceforge.net/ as merge tool? In case of conflicts it resolves everything it can do automatically and only non-automatically resolved merge conflicts left over for manual resolution.
Cheers
Neil
-----Original Message-----
From: Warren Block [mailto:wblock_at_wonkity.com]
Sent: Samstag, 12. Januar 2013 21:24
To: users_at_subversion.apache.org
Subject: external merge tools for conflicts only
Is there any way to get svn to use an external merge tool, but only for
conflicts?
In other words, if I set up an external merge tool like diffuse
(http://diffuse.sourceforge.net/), when svn finds a conflict it just
throws both repository and working copy files at the external merge
tool. In that tool, you'll see every difference, not just the
conflicts. What I'd like is to have svn merge everything it can,
and then call the external merge tool. The only differences shown in
that tool will be the conflicting sections. Sort of an external
version of the 'dc' command.
Or is there some other way to do this? I'm using svn 1.7.8.
________________________________
Firma: Capgemini Deutschland GmbH
Geschäftsführer: Dr. Michael Schulte (Sprecher) • Dr. Uwe Dumslaff • Josef Ranner
Aufsichtsratsvorsitzender: Antonio Schnieder
Amtsgericht Berlin-Charlottenburg, HRB 98814
This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.
Received on 2013-01-14 09:05:18 CET