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

Re: Implementing XML-versioning?

From: Mike Mason <mgm_at_thoughtworks.net>
Date: 2004-09-27 00:13:50 CEST

Sebastian Rönnau wrote:

>My main questions are:
>- is it possible to change subversions' diff-algorithm at all? Jim Blandy et
>al. mention a client side diff-plugin support which should be implemented
>after 1.0. Where can I find more information about it?

On the client, "svn diff" takes a --diff-cmd switch which allows you to
use a different diff tool when displaying differences on the client.
"svn update" takes a --diff3-cmd switch which allows you to use a 3-way
merge tool other than the one built into Subversion. These are all
client-side only, they won't change the way Subversion stores deltas
internally (binary diffs between revisions).

Maybe this answers your question, maybe not! Is plain old text merging
not sufficient for OpenOffice's file format?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 27 00:14:18 2004

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

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