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

Re: How do you disable merge for certain files?

From: Ryan Schmidt <subversion-2006d_at_ryandesign.com>
Date: 2006-10-11 03:58:58 CEST

On Oct 10, 2006, at 20:31, Walter wrote:

> I have some Xcode project files that don't like to have their changes
> merged. The file itself appears to be XML.
> When merged, the project file becomes corrupt and Xcode refuses to
> open the
> project.
> Is there a way to disable automatic merge for specific files when
> doing an
> update?

You could set the svn:mime-type property of those files to something
that does not begin with "text/" and Subversion will consider them
binary and will not merge them.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 11 03:59:42 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.