[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. Michael Pilato <cmpilato_at_collab.net>
Date: 2004-04-02 18:27:58 CEST

"C.A.T.Magic" <c.a.t.magic@gmx.at> writes:

> > 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?

Locking is intended to prevent collisions between multiple
modifications of the same unmergable binary file, not 'svn merge'
operations across different ones. "Merge" has too many meanings in
VC.

---------------------------------------------------------------------
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:29: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.