[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 12:43:35 +0100

Julian Foad wrote:
>> * there never was consensus for the "obvious" ones, for the simple
>> reason that they're not always obvious -- e.g., consider
>> application/xml, which sometimes can and sometimes can't be
>> properly merged.
>>
>
> We don't need to try to be too clever. Either we decide that Subversion
> shall do line-wise blame/diff/merge on these kinds of formats, or we
> decide that it won't. People can plug in their own merge tools if they
> need more advanced behaviour, so I think we should make these formats be
> classified as "text" and therefore use blame/diff/merge on them.
>

We'd be taking it upon ourselves to provide a definite answer to an
indeterminate question, and the only result would be that we'd piss off
the other half of our users.

[...]

>> But more about that in the "real" response.
>>
>
> Please first make sure you see my reply to B. Smith-Mannschott in this
> thread, in which my text begins "Ah, yes, it is illogical".
>

Yup, I will; have read it but now must rush. (It's a bit uncomfortable
to jump the gun with responses in this way ... please bear with me.)

-- Brane

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2419470
Received on 2009-11-18 12:44:14 CET

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