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

Re: Is XML text?

From: Pierre THIERRY <pierre.thierry_at_moine-fou.org>
Date: 2004-06-11 15:50:55 CEST

> I believe that the last time this came up, someone said there was a
> least one xmldiff-like program which could deal with this, but then
> the difficulty is how to switch to that internally.

I don't see the point using a specific diff algorithm... I do classical
line-based diffs with XML files on a daily basis, without any problems.

> Some XML files could be diff'd using the built in tool and remain
> well-formed; others (especially machine generated) could not.

I don't see how a diff and merge could break well-formedness. In every
case where it could, it would be because of merge conflicts, so the user
would have to resolve the conflicts manually (and then would keep the
document well-formed in its modifications).

Some machine-generated XML files (far from all of them, though) are not
indented nor formatted, and contain very long lines, when not only one
line. It would be straightforward to exclude some XML MIME types from
being treated as text, wouldn't it?

> The status quo is appropriate until such time as an XMLdiff can be
> added to the core libraries.

In the meantime, is there a way to manually tell Subversion some types
are text, or is it impossible to use Subversion with XML source files?

Simply,
le Moine Fou

-- 
pierre.thierry@moine-fou.org
OpenPGP 0xD9D50D8A

Received on Fri Jun 11 18:05:38 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.