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

Re: Storing XML

From: Sander Striker <striker_at_apache.org>
Date: 2004-01-09 11:35:20 CET

On Fri, 2004-01-09 at 11:19, Torsten Rueger wrote:
> Moi,
> is anybody here storing xml in subversion? Specifically is there a way
> to avoid stupid conflicts wit xml?
> I mean, if I store the document <foo/>
> and A edits it to <foo a="bar"/>
> and then B edits it to <foo b="bar"/>
> there will be a conflict using subversion and "text" mode. Even,
> logically there is no conflict, as <foo a="bar" b="bar" /> is the
> merged result.
> So is there a way to avoid these "artificial" xml conflicts ?

At the moment, no. Maybe in some future version of subverion,
when/if we decide to do pluggable merge modules. Currently
we only support text, using the lines as the tokens we compare.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 9 11:36:03 2004

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

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