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

Re: Locking functional spec: read-only WC

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-10-14 17:37:01 CEST

"Michael Brouwer" wrote
> Of course that particular problem would be better solved by a better
> diff3 type algorithm that can deal with indentation changes rather
than
> file locking. After all locking doesn't solve the problem of wanting
> to merge branches or even patches applied in the past.

Yes, there are various other solutions to that *particular* problem. The
point I am making is that in the general case, there will always be
occasional unmergeable (well, hard-to-merge anyway) changes in what is
normally a straightforward file. You can't include a merge algorithm to
suit every occasion.

But locking in this case is probably too difficult anyway.
Mandatory-lock and no-lock is OK, but sometimes-lock is much harder.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 17:51:53 2004

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