[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-09-22 19:24:53 CEST

Aleksey Nogin <aleksey@nogin.org> writes:

> 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:

As I recall that single "binary vs text" was a deliberate
simplification.

> - It does not like the idea of using svn:eol-style with "binary" mime types

You can do that with "svn ps".

> - It does not seem to be possible to have an "OK to diff, not OK to
> merge file"

You might be able to do that with external diff/diff3 commands.

> or "eol-style=native, but do not merge" file.

You can do that with "svn ps".

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

As you have discovered we haven't fixed all the existing corner cases,
choosing to add lots of new corner cases is an odd way to improve the
situation :)

-- 
Philip Martin
---------------------------------------------------------------------
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:25:34 2005

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