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

Re: Merge mode (Was Classifying files as binary or text)

From: Branko Cibej <brane_at_xbc.nu>
Date: Wed, 18 Nov 2009 21:00:44 +0100

Mark Phippard wrote:
> This probably is an example of our OCD getting in the way. Why did we
> even add this mime.types feature to begin with? Who thought it would
> be a brilliant idea to add a "proper" mime-type to every file in the
> first place? Basically, we added a feature that was not needed that
> cascades to create a problem.

Couldn't agree more ... we badly misjudged that one. Using mime.types is
OK if you're setting svn:mime-type, but not if you're also telling SVN
how to diff/merge/whatever that file.

(BTW ... we could have a different prop name instead of merge-mode to
indicate that it can, in fact, cheerfully apply to diff and blame, too.)

-- Brane

Received on 2009-11-18 21:01:00 CET

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