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

Re: Forcing svn:eol-style=native on files with "binary" mime types?

From: Aleksey Nogin <aleksey_at_nogin.org>
Date: 2005-09-26 09:02:08 CEST

On 25.09.2005 16:00, Marc Sherman wrote:

>> And frankly, in this context, "diffable but not mergeable" is
>> nonsense. Later on, when diff/merge plugins can better discriminate
>> the file types, this issue (if it actually is an issue) will go away.
>
>
> I've got a counter-example that you may consider bogus: Visual Studio's
> installer project files (*.vdproj) are machine-generated XML.

Right - and this kind of situation is somewhat common. Whenever you have
  text files that have complicated internal structure and are generated
by some program, then it's quite natural to want them to be diffable,
but not mergeable.

-- 
Aleksey Nogin
Home Page: http://nogin.org/
E-Mail: nogin@cs.caltech.edu (office), aleksey@nogin.org (personal)
Office: Moore 04, tel: (626) 395-2200
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 26 09:03:23 2005

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