[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-05 16:28:12 CEST

On May 5, 2006, at 16:10, Michael Swanson wrote:

> Does anyone know if there is a setting somewhere in subversion that
> allows you to define how close changes have to be to one another
> before
> subversion will detect them as a conflict? I would like to make
> subversion throw a conflict on any file if its been changed by someone
> else since my last checkout. Is this something I could do in a hook
> script? It seems to me that this would be difficult, because as I
> understand it, hook scripts can only force an entire commit to simply
> fail, not actually change what subversion sends back to the client.
> I've looked in the list archives and in the SVNBook and haven't found
> anything related to this. Thanks for any help you might be able to
> give.

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.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 5 16:29:54 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.