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

Re: file locking and binary files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-11-15 19:10:43 CET

Clint Chapman wrote:

> >So, subversion solves this problem - good stuff. But it seems to force
> >merging over file-locking. This just isn't possible for most binary files.

Mind you, Subversion doesn't actually try to "merge" binary files. If
a binary file becomes conflicted after an update, Subversion places
all 3 binary fulltexts side-by-side, so the user can choose between
them, etc.

As Garrett said, someday, after 1.0, we'll probably be forced to
implement some kind of locking, or a minimum, a communication system
which helps users discover whether a file is being edited.

(This pressure also comes from the desire to increase our WebDAV
interoperability, which has LOCK and UNLOCK methods.)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 15 19:13:29 2002

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