Hi Travis,
> On May 13, 2004, at 10:19 AM, Curtis G Pew wrote:
>
> > The svn book says:
> >
> > " ... if a file's svn:mime-type property is set to a non-text MIME
> > type (generally, something that doesn't begin with text/,
> though there
> > are exceptions), Subversion will assume that the file contains
> > binary-that is, not human-readable-data."
> >
> > So I was wondering if "*/*+xml" types were among the exceptions. In
> > particular, I have a SVG file and I'm wondering if setting the MIME
> > type to 'image/svg+xml' means Subversion will treat it like
> a binary
> > file.
>
> I would guess that many if not most XML representations need to be
> treated as a binary file because they cannot be merged. If Subversion
> thinks such a file is text, it'll try to merge, creating
> quite possibly a very nonsensical result.
Why do you say XML cannot be merged? All the XML I have worked with has
been as mergeable as source code - i.e. mostly trivial changes in
unrelated areas of the file; sometimes conflicts in the same area of the
file which hopefully will get caught and flagged by the merge tool (but
occasionally will result in duplicate sections of code). If the merge
tool didn't make any attempt, I would end up using a diff tool to do the
merge by hand - but I would most definitely be doing a merge.
Of course, there always the chance of tools getting confused - I always
check and test after the merge before checking in. But that goes for
all text document types - .c, .h, .pl, ...
I'm with Curtis on this one - I would like my XML to be treated as text.
Cheers,
Ian Brockbank
Senior Applications Software Engineer
e: ian.brockbank@wolfsonmicro.com / apps@wolfsonmicro.com
scd: ian@scottishdance.net
t: +44 131 272 7145
f: +44 131 272 7001
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 14 11:02:01 2004