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

xxdiff support for subversion

From: Martin Blais <blais_at_furius.ca>
Date: 2004-02-24 19:23:36 CET

hi all

is there anyone using xxdiff along with subversion?
if so, then could you indicate how?

xxdiff is my file comparison and merge tool. as of the 3.0 release, i
added some features to xxdiff that make it even easier to integrate
with various VC systems. in particular, there is a new "--decision"
option which forces the user to exit with one of "accept", "merge",
"reject" codes; that can make it very easy to implement an interactive
conflict-resolution system on top of the update or merge process.
xxdiff also allows you to interactively select the diff hunks to
produce a merged result if necessary. also, xxdiff supports 3-way
diffs and merges, you can find it here::


i'm assuming that subversion itself would be invoking xxdiff; from
reading the docs it seems to me that subversion is smart enough to
integrate visual comparison programs like that, rather than to have to
write a script that does that stuff by fetching various versions of
files to temporary files and then invoking xxdiff like i do for some
other systems. i wrote a wrapper script that can visualize the output
of "cvs diff" directly, that could be another way::


i read the book and then have been fiddling with subversion last night
when i heard v1.0.0 had been released and simply attempted replacing
"diff-cmd" in my user config (~/.subversion/config); the documentation
does not indicate how to format the arguments and replacing diff-cmd
seemed to behave differently when specifying more than a single
argument, so i wrote a very simple wrapper script that deals with the
default arguments that are given to diff and it works in that specific

i would like to know all the various ways and situations that
subversion can invoke it, all the use cases, to make that script more
general, and also all details on how to make it integrate better.
basically, any info for this to be done "right" would be appreciated.

as the author of xxdiff i would be happy to implement, distribute and
maintain that wrapper script.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 24 19:23:26 2004

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.