RE: Storing XML

Hiya,

To the best of my knowledge, SVN doesn't (currently) support any kind of
per-filetype specialized merge support. No special support for XML, nor for
MS-Word, nor for any other filetype.

I do store XML in SVN, but I treat it like any other regular textfile.

I think that SVN will currently generate a conflict here when trying to
merge, so that you can manually merge this.
To me, that actually makes sense. I'm not sure that I would nessecarily
*want* my merging-tools to automatically perform a merge like this on an
XML/HTML file.

Specialized diff/merge support for various filetypes would be very usefull
though; is there any intention to add such support for 1.1 / 2.0 / x.y?

regards,

--Tim

-----Original Message-----
From: Torsten Rueger [mailto:torsten.rueger@hiit.fi]
Sent: vrijdag 9 januari 2004 11:19
To: users@subversion.tigris.org
Subject: Storing XML

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 ?

Thanks

Torsten

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
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:33:34 2004