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

Re: Roadmap for 1.1 (locking)

From: C.A.T.Magic <c.a.t.magic_at_gmx.at>
Date: 2004-04-02 18:27:58 CEST

Stephen Warren wrote:

>>>The primary purpose of locking is to prevent
>>>collisions. Editing the same file in two different branches
>>>doesn't cause a collision.
>>
>>but how will this work if the locking is intended to prevent
>>collisions
>>between unmergable binary files?
>
>
> Typically, when you're versioning binary files and using locks, you won't be merging between branches.
> This is all about making sure two people don't accidentally start editing the same non-mergable document in the same branch at the same time, then have to re-do their work when they realize someone else beat them to the check-in.
> If you branch, and your tool doesn't support merging, then you're stuck manually merging from branch to branch - making the same changes manuall to the N documents on the N branches (if you ever need this = i.e. you really have branches and not just 'release tags') - and nothing will help you there...

good to know.
so its probably best to
-) do not lock/edit unmergeable files anywhere but on /trunk
-) or ask the SCM before you start to modify such a file
    if -anyone- modified-or-locked it on -any- branch
    and then lock it globally.

======
c.a.t.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 2 18:28:22 2004

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