Handling unmergeable files -- a call to arms

[Russel Winder]

Martin,

On Sat, 2009-05-30 at 09:26 +0200, Martin Pool wrote:
[ . . . ]
> I think you need to decide how distributed you want this to be,
> because various options are possible.  Is there a global lock?  If you
> can't reach it do you proceed optimistically, or refuse the change?
> Or do you rely on some kind of asynchronous propagation based maybe on
> email or bzr commits.

I think there has to be a global lock within a very restricted meaning
of "global".  I think the point about checkout gets us a long way here. 

[ . . . ]
> So this suggests that perhaps locking should only work in checkouts of
> a central branch, it should make the files physically readonly until
> they're locked, and it should keep a list of locked files in the
> central branch.  This wouldn't protect distributed branches, but for
> such users perhaps that is an advanced case...

I think this may well be a good tenet for this:  locking only works for
bound branches/checkouts of the original central branch.

The act of locking would require access to the central branch and so
would only be possible when connected.

I agree, anyone taking an unbound branch rather than a checkout is
stepping outside the locking system and is therefore on their own.

I think this all fits rather well, thanks.

I guess I should find out how to write plugins, and start a branch.

-- 
Russel.
=============================================================================
Dr Russel Winder      Partner
                                            xmpp: russel at russel.org.uk
Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,   f: +44 8700 516 084   voip: sip:russel.winder at ekiga.net
London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090530/1ed4a121/attachment.pgp