Strategies for push/merge problem?

[Sean Russell]

On Tuesday 15 July 2008 01:51:19 am Peter Arrenbrecht wrote:
> So - to continue a previous thread - how about the following for a
> plan to implement server-based `hg pushmerge` and `hg pushrebase` (or
> whatever better names we can find)?
[Lots of good design discussion snipped]

It might be worth while to take a look at how bzr solved this problem; they 
have a centralized server mode, with support for locking, and they may have 
some ideas worth stealing.

--- SER