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

Re: XML diff-merge utility that plugs into TortoiseSVN?

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: 2006-11-06 00:56:43 CET

Quoth hedley.finger@myob.com:
> I am using TortoiseSVN and Subversion to control versions of XML files
> (actually, conforming to the DITA schemas, if this helps anyone). These
> files are being opened and worked on by various editors that each have
> their own ideas of pretty-printing, tab/space replacement.
>
> While doing a commit recently I idly displayed the diff of a file being
> committed and was startled to see that content that would be considered
> identical by a conforming XML editor was being treated as a difference by
> TortoiseMerge, so that the delta was about the same size as the file
> itself!

To resolve that, I think you'd have to normalise the XML files -- ie.
strip all whitespace (or strip and then write out with consistent
whitespace), and wherever possible sort elements and attributes in some
well-defined order (eg. alphabetically).

Admittedly this occasionally bugs me as well (particularly when dealing
with XML files that Visual Studio produces, or that have been loaded and
rewritten via some sort of hashtable), but not enough to do anything
about it :)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Nov 6 00:57:18 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.

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