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

Re: xxdiff support for subversion

From: Martin Blais <blais_at_furius.ca>
Date: 2004-02-25 23:09:45 CET

On Wednesday 25 February 2004 15:40, Ben Collins-Sussman wrote:
> Hope this clarifies things.

very much so thank you! i thought that part of the roles for these hooks were
intended for display for "svn diff" and that as such i would not need to
implement a script to loop over the files and inspect the status.

one use for a update or merge hook i subversion would be to prompt the user
with a tool such as xxdiff and selectively merge changes depending on the
user's answer (even for changes with no conflicts). the alternative requires
interpreting the output of "svn status" _before_ merging and calling svn
update selectively after displaying diffs. i did implement something like
that over CVS but it was tricky (although in the end i managed to make it
work reliably). i feel it would be nicer to just hook into subversion's own
update semantics rather than to try to interpret things the same way.
anyway, to do that, i can use "svn status -N" and "svn list -R" and connect
matching pairs, but i still would have to deal with file deletions/additions

also, it should be *very* easy to build a tool that can preview and resolve
conflicts graphically with xxdiff _after_ update/merge, especially since it
leaves the 3 files (with CVS i had to extract them). i will do that at some
point and distribute it with xxdiff.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 25 23:09:18 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.