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

On Fri, Nov 15, 2002 at 12:10:43PM -0600, Ben Collins-Sussman wrote:
> Clint Chapman wrote:
> > >So, subversion solves this problem - good stuff. But it seems to
> > >force merging over file-locking. This just isn't possible for most
> > >binary files.
>
> Mind you, Subversion doesn't actually try to "merge" binary files. If
> a binary file becomes conflicted after an update, Subversion places
> all 3 binary fulltexts side-by-side, so the user can choose between
> them, etc.

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.

-- 
Colin Watson                                  [cjwatson@flatline.org.uk]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org