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

Re: Disabling automatic conflict resolution?

From: <kfogel_at_collab.net>
Date: 2003-08-17 07:24:22 CEST

Ben Collins-Sussman <sussman@collab.net> writes:
> > I think James means automatic merging. And we don't have any option
> > to disable automatic merging.
>
> Sure we do. Set the svn:mime-type property on every file to something
> non-texty.

I was thinking about that... Trouble is, it breaks 'svn diff'. And a
lying mime type might cause all sorts of other problems, if not with
Subversion than perhaps with other software. So it's not a very
pleasant workaround.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 17 08:05:43 2003

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