Re: "textual binary" MIME types (was Re: file locking and binary files)

Colin Watson <cjwatson@flatline.org.uk> writes:

> I noticed this recently when importing some old versions of a Debian
> source package containing .xbm files. I'd set svn:mime-type to
> image/x-xbitmap for these, following /etc/mime.types, and naturally
> Subversion treated them as fulltexts in the way you describe. Actually,
> though, .xbm files are just text, so I really wanted the merge to happen
> in the way it would have done for text/* MIME-types.
>
> Are there any plans to make svn_mime_type_is_binary() more configurable,
> so that one can say "although this isn't text/*, I want to treat it that
> way anyway"? I appreciate that this is a corner case.

That sounds like a totally reasonable enhancement request. Maybe you
can file an enhancement issue?

My first intuition is that maybe we can just create a new property,
like "svn:force-merge" or something. It's mere presence causes svn to
unconditionally attempt a contextual merge. Are there other
approaches?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 15 19:48:36 2002