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

Re: Merging is not happening for word documents.

From: Andy Levy <andy.levy_at_gmail.com>
Date: Wed, 13 Feb 2008 15:54:36 -0500

On Feb 13, 2008 3:41 PM, Ron Wilson <ronw.mrmx_at_gmail.com> wrote:
> On 2/13/08, Scott Grizzard <scott_at_scottgrizzard.com> wrote:
> > If you change your Word settings to save documents in XML format, you can
> > avoid (or at least mitigate) that problem in the future. XML documents are
> > just text, and svn can merge those.
>
> Maybe. While XML files are just text, the order of the elements and
> attributes could change without changing the actual content contained
> with the XML markup. In the case of Word document, the actual textual
> content might not change, but the order of some of the "supporting"
> elements, or of attributes.
>
> Example:
>
> <a id="now"/><div id="3" class="quotation">Now it the time ...</div>
>
> is equivalent to:
>
> <div class="quotation" id="3"><a id="now"/>Now it the time ...</div>
>
> But the XML file is different. And would result in an SVN conflict.

These two examples are not equivalent. In your first example, <a> and
<div> are siblings. In the second, <a> is a child of <div> (create a
small XML document for each and load them into something that shows
the node tree structure like XMLSpy). VERY different. The end result,
if transformed to HTML, functions the same, but the XML structures
themselves are NOT equivalent.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-13 21:54:43 CET

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