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

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

From: Aleksey Nogin <aleksey_at_nogin.org>
Date: 2005-09-22 18:34:14 CEST

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.

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

-- 
Aleksey Nogin
Home Page: http://nogin.org/
E-Mail: nogin@cs.caltech.edu (office), aleksey@nogin.org (personal)
Office: Moore 04, tel: (626) 395-2200
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 22 18:35:08 2005

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