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

Re: property co-existence problems.

From: <kfogel_at_collab.net>
Date: 2004-10-25 21:01:23 CEST

Jani Averbach <jaa@jaa.iki.fi> writes:
> 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.

Heh -- now we're already experiencing feature creep, or something like

There are several different problems going on here, I think:

   1) We determine textiness from mime-type.
   2) We determine mergeability from textiness.
   3) We determine eol-mungability from textiness.

The proposal for the "svn:text" property solves problem number (1).
Now we would have a way to determine textiness.

But is "textiness" the right determinant for how to merge something?
And is an object's preferred merging behavior related to its proper
diff behavior? And are either of these two things related to whether
svn:eol-style should be honored?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 25 22:54:00 2004

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.