[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: Ron Wilson <ronw.mrmx_at_gmail.com>
Date: Wed, 13 Feb 2008 15:41:03 -0500

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.

---------------------------------------------------------------------
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:41:13 CET

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