[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: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 17 Nov 2009 16:35:00 -0500

On Tue, Nov 17, 2009 at 3:56 PM, 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
> (3) Change the text quoted from the SVN manual under Background to
> read as below.
> (4) Update the implementation to agree.
>
>    Subversion treats the following files as [[mergable]]:
>
>        * Files with no svn:mime-type [[and no svn:merge-mode]]
>        * Files with a svn:mime-type starting "text/"
>        * Files with a svn:mime-type equal to "image/x-xbitmap"
>        * Files with a svn:mime-type equal to "image/x-xpixmap"
>        * [[Files with a svn:merge-mode that is equal to "simple"]]
>
>    All other files are treated as [[unmergeable]], meaning that
> Subversion will:
>
>        * Not attempt to automatically merge received changes with
> local changes during svn update or svn merge
>        * Not show the differences as part of svn diff
>        * Not show line-by-line attribution for svn blame
>
>    In all other respects, Subversion treats [[mergable]] files the
> same as [[unmergeable]] files, e.g. if you set
>    the svn:keywords or svn:eol-style properties, Subversion will
> perform keyword substitution
>    or newline conversion on [[unmergeable]] files.

I am good with this. Proposal seems clear and well thought out.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2419166
Received on 2009-11-17 22:35:08 CET

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