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

Re: Enforce always conflict during the update procedure?

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-07-07 15:54:45 CEST

On Thursday 07 July 2005 11:17, Libor Jendele wrote:
> ... the problem is that
> somtimes [..] the system "updates" my local version of the file
> automatically and I have no way to compare the result of such an update with
> my (local, PC) version of the updated file prior the automatic update! The
> local version of the file gets overwritten without leaving any backup copy
> to which I can compare !!
[...]
> how can I suppress the quotted
> automatic merge during the update and enforce to obtain a conflict
> situation in all cases, i.e. even case of minor and negligable changes in
> the document during the update that are now handled automatically.

Totally untested idea: set the mime-type of the file to binary. I believe this
will keep Subversion from trying to merge it.

> Another solution would be to allow such an automatic update but I'd get
> somewhere a copy of the version of the automatically updated files, (i.e.
> my local versions of the file) just prior the update.

You can use 'svn cat ..' to retrieve a single file.

> Note that I don't like to use locking and unlocking technique to protect
> the files, as I believe in open-source policy within developers' teams.

Hmmm, if files are not mergeable, then locking is just a means of
communication between developers. After all, locks can be configured to only
be advisory, i.e. someone else can steal the lock if they need. I have no
idea what this has to do with open-source policy though.

Uli

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 7 15:59:02 2005

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