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

Re: Disable automatic merge

From: John Szakmeister <john_at_szakmeister.net>
Date: 2005-03-02 17:48:03 CET

CÚdric Girard wrote:
> Hi,
>
> I work with Borland Delphi, tortoiseSVN 1.1.2 and subversion 1.0.1
> server under linux.
> We often have problems with automatic merge of DFM files (textfile
> containing gui description). I want to disable automatic merge, I want
> to do all merge by hand.
>
> What can I do?

One optioin would be to set the svn:mime-type field to something other
than text/*. The it will flag everything as a conflict and force you to
merge by hand.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 17:52:59 2005

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