[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: Marc Sherman <msherman_at_projectile.ca>
Date: 2005-09-25 15:00:16 CEST

Branko Čibej 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. Every
minor edit of the installer in the VS GUI causes a massive rewriting of
the file, including reordering many similar looking elements, and
arbitrarily chaning many GUID keys in the file. This means that two
small simultaneous edits will create wildly divergent files, so they
can't be effectively merged.

However, some localized sections of the file are relatively stable from
one change to the next, and diffing is useful to examine changes in
those sections of the file.

- Marc

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Sep 25 15:01:08 2005

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