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

external merge tools for conflicts only

From: Warren Block <wblock_at_wonkity.com>
Date: Sat, 12 Jan 2013 13:23:37 -0700 (MST)

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.
Received on 2013-01-12 21:24:12 CET

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.