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

Re: Text vs binary - eol-style, mime-type, allow merging, etc.

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-09-22 19:01:14 CEST

Aleksey Nogin wrote:
> This is a follow-up on recent threads "Interpretation of SVN MIME type
> property" and "Forcing svn:eol-style=native on files with ``binary''
> mime types?"
>
> It seems to me that subversion currently improperly bundles 4 _distinct_
> notions:
>
> 1) Whether the file EOLs should be converted (svn:eol-style)
> 2) Whether the file's svn:mime-type is "binary"
> 3) Whether it's OK to attempt to merge changes to avoid conflicts
> 4) Whether it's OK to display diffs for the file.
>
> Right now it feels that subversion simply lumps all the above together
> into a single "binary vs text". Namely:
>
> - It does not like the idea of using svn:eol-style with "binary" mime types
> - It does not seem to be possible to have an "OK to diff, not OK to
> merge file" or "eol-style=native, but do not merge" file.

Yes, that's about right. One could argue that point (2) is a part of the
algorithm for deciding (1), (3) and (4), rather than a sibling of them, but
basically you're right: it confuses these concepts.

> Would people be interested in developing a more fine-grained support for
> these 4 different "sides" of the "text vs binary" distinction?

Yes, I would be interested. I can't promise to devote much time to helping
with this, but I will try to help.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 22 19:02:04 2005

This is an archived mail posted to the Subversion Dev mailing list.