Strategies for push/merge problem?

[Sean Kelley]

Hi,

On Tue, Jul 15, 2008 at 8:42 PM, Sean Russell <hg at ser1.net> wrote:
> 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.


They support a number of different workflows:

http://bazaar-vcs.org/Workflows

Sean
>
> --- SER
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>