[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: Sebastian Rönnau <Sebastian.Roennau_at_unibw-muenchen.de>
Date: 2004-10-01 20:23:15 CEST

> >- is it possible to change subversions' diff-algorithm at all?

> 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.
which doesnt't seem to affect the way subversion handles the two revisions of
one file, does it?

> "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).
My thought was to implement the xml-diff directly in subversion including its
own diff format. But I fear that this would involve a re-implementation of
the complete libsvn_client...
But I think that svndiff format is not ideal for storing xml-files (the
deltas), isnt it? I think, that my initial idea was too naive. If anyone has
a new idea, how to link a new diff / patch to subversion, please let me know.

> Maybe this answers your question, maybe not! Is plain old text merging
> not sufficient for OpenOffice's file format?
For two reasons the answer might be no:
1. OOo files are a zip archive containing several xml-files.
2. OOo uses XML files without any white spaces or newlines. If you apply GNU
diff on such a file, it marks all the file (which consists of only one line)
as updated. According to this, the delta has twice the size of the original
file. I don't know, whether svndiff performs better.

> Cheers,
> Mike.
Thank you for the answer,

Sebastian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 1 20:35:18 2004

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