Re: "textual binary" MIME types (was Re: file locking and binary files)

   I'd prefer an svn:merge-method property which specifies which merge
method (where we already support "diff3" and
"last-in-is-supreme-ruler-of-the-bits" or some such) to use in hopes
that one day, there will be more than one available to the svn client.
It's not "do we merge?" so much as "how do we merge?" There may be
different text merge methods (eg. an XML merge which parses the file
and is magically more clever than diff) as well as binary methods.

        -wsv

On Friday, November 15, 2002, at 10:46 AM, Ben Collins-Sussman wrote:

> My first intuition is that maybe we can just create a new property,
> like "svn:force-merge" or something. It's mere presence causes svn to
> unconditionally attempt a contextual merge. Are there other
> approaches?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 22 20:00:28 2002