[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: B. Smith-Mannschott <bsmith.occs_at_gmail.com>
Date: Tue, 17 Nov 2009 22:46:16 +0100

On Tue, Nov 17, 2009 at 21:56, Mike Samuel <mikesamuel_at_gmail.com> wrote:
> I thought I'd start a new thread about issue 1002 with a writeup of
> Branko's merge mode property. The proposal is first, followed by the
> same background as before and slightly updated goals.

> Proposal:
> ========
> (1) Add documentation on the svn:merge-mode property that lists the
> allowed values as ("simple" and "none")
> (2) Add example autoprops rules to the documentation that sets
> svn:merge-mode to "simple" for the following file types
> application/ecmascript
> application/json
> application/xml
> image/svg+xml

Strictly speaking, autoprops apply are triggered by file name
patterns, not file [mime] types.


Generally, I like the proposal:

1. It keeps svn:merge-mode orthogonal to related svn:keywords,
   svn:eol-style svn:mime-type properties.

2. The goals section strikes me as both simple and sufficient. (Less
   chance of unintended consequences.)

// Ben

Received on 2009-11-17 22:46:31 CET

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