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

Storing XML

From: Torsten Rueger <torsten.rueger_at_hiit.fi>
Date: 2004-01-09 11:19:13 CET


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 ?



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:20:36 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.