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

Re: Cross-branch locking

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-09-15 05:09:19 CEST

On Sep 14, 2005, at 6:55 PM, James McNeill wrote:

> Locking a file only locks it in one place in the repository. If
> you have a
> trunk and a branch version of a non-mergeable (binary, usually)
> file, it is
> still possible for people to make changes to both copies
> simultaneously and
> end up with non-mergeable changes.
>
> Has anyone thought about ways to prevent this from happening?

Why not lock both locations? You can run 'svn lock' on URLs if you
wish.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 05:11:08 2005

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