Re: Roadmap for 1.1 (locking)

"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