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

RE: Re: Roadmap for 1.1 (locking)

From: Stephen Warren <swarren_at_paramanet.com>
Date: 2004-04-02 18:21:01 CEST

> From: C.A.T.Magic [mailto:c.a.t.magic@gmx.at]
> Jay Glanville wrote:
> >>Simon Raess wrote:
> >>
> >>I have a question on locking and svn in general:
> >>when locking a single file, you would only lock
> >>
> >>for example
> >>
> >> /trunk/foo.txt
> >>
> >>but all other branches that contain this file
> >>
> >> /bar/Branch01/foo.txt
> >> /bar/Branch02/foo.txt
> >>
> >>would remain unlocked, since svn is unable
> >>to detect that these are branches and are related.
> >>
> >>Or do I misunderstand that?
> >
> >
> > Correct. That is my common usage of locking in other SCM
> > systems. 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...

Stephen Warren, Software Engineer, Parama Networks, San Jose, CA
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:21:36 2004

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.