[python-committers] [PSF-Members] Code Simplicity » Open Source Community, Simplified

[Antoine Pitrou]

Le vendredi 04 février 2011 à 17:25 +0100, Dirkjan Ochtman a écrit :
> On Fri, Feb 4, 2011 at 16:49, Nick Coghlan <ncoghlan at gmail.com> wrote:
> > On the other hand, if *any* forward port naturally picks up all the
> > missed forward ports, then the Mercurial perspective starts to make
> > more sense (especially if the merge is able to exploit the DAG in
> > order to make fewer mistakes).
> 
> That's exactly the idea of the Mercurial way. You type hg merge
> <branch> and it will merge everything from the other branch that
> hasn't been merged yet (where both "blocking", in svnmerge
> terminology, and merging count as having been merged).

How do you "block"?