Re: property co-existence problems.

On 2004-10-25 15:33-0500, Ben Collins-Sussman wrote:
>
> An idea floating around the Chicago office is to add a new property:
> 'svn:text'. If this property exists, then it *authoritatively* means
> the property is text-y and safe for contextual diffing/merging. If it
> doesn't exist, then svn resorts to looking at 'svn:mime-type' to hazard
> a guess.
>
> Is this a reasonable solution? If people like it, I can file a new
> feature request.
>
I like the idea, but: What about if this property could contain a value and
the name is in fact svn:merge (or what ever):

svn:merge=diff
svn:merge=xml-diff
svn:merge=my-very-special-binary-diff

This way we won't paint ourselves in the corner, if and when, we have
some day any other merge support than ordirany diff. Or the semantic
of the value could be that if it is NULL, then use default (diff)
otherwise the system specified by the value.

BR, Jani

-- 
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org