[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 20:50:22 CEST

Aleksey Nogin <aleksey@nogin.org> writes:

> On 22.09.2005 10:24, Philip Martin wrote:
>>>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 :)
> Well, my proposal would be to allow users to explicitly override
> subversion defaults in case they hit one of those "corner
> cases".

You haven't understood what I mean by corner cases.

> Basically, I would propose adding two new properties:
> svn:allow-diff
> svn:allow-merge
> with possible values "true" or "false". The idea would be that when
> the corresponding property is not present, then act in a backwards -
> compatible way, but if it is present, then do as instructed.

Off the top of my head heres a corner case. Merge will have four
possible values of allow-merge: the two sources, the working base
version, and the local modification. Which value gets used?

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 20:51:21 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.