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

Re: Force conflict on any changes to same file?

From: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-05-09 00:02:40 CEST

On May 8, 2006, at 23:44, Michael Swanson wrote:

>> I believe you can either give the file a non-text MIME type (such as
>> "application/octet-stream"), or you can specify something like "/bin/
>> false" as the diff program, and Subversion will then always perceive
>> a conflict.
> Is this a change you would make on the server or on the local
> side? I'm
> not exactly sure where subversion performs this operation, locally or
> remotely? Thanks.

To set the MIME type of a file, you would get a working copy, set the
file's svn:mime-type property, and commit the change.

To change the diff program, you use the --diff3-cmd argument to the
svn merge command on the client side, or you set the diff3-cmd line
in the Subversion config file (located at ~/.subversion/config on
Unix-like operating systems) also on the client side.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 9 00:03:59 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.