[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: Aleksey Nogin <aleksey_at_nogin.org>
Date: 2005-09-22 21:04:20 CEST

On 22.09.2005 11:50, Philip Martin wrote:

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

It should be resolved the exact same way as it happens today! An
implicitly defined notion of "mergeable" exists already (currently it's
equivalent to "does not have a binary mime-type"), I am just proposing
to make it possible to define it explicitly.

P.S. I am not sure how it works today, but IMHO the merge should occur
only if all 3 versions are mergeable. Although looking at only the local
copy is not completely unreasonable.

-- 
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 21:06:24 2005

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