[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: Kalin KOZHUHAROV <kalin_at_thinrope.net>
Date: 2005-09-15 05:59:10 CEST

Ben Collins-Sussman wrote:
>
> 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.

What if there are 231 branches + trunk :-) You have to lock 232 URLs...

TSVN (GUI) cannot handle that easily, I think.

CLI cannot handle something like that, I guess (not tried):
svn lock 'http://example.com/repos/mine/branches/*/doc/whatever.doc'
end even then we usually have trunc/doc and branches/FOO/doc

Having a "symlink" in the branch pointing to the trunk can solve all that.
Not supported at the moment, I think.

Kalin.

-- 
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
---------------------------------------------------------------------
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:59:48 2005

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