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

[Dirkjan Ochtman]

On Fri, Feb 4, 2011 at 17:31, Antoine Pitrou <solipsis at pitrou.net> wrote:
>> 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"?

By reverting changes during the merge (after hg merge, before hg commit).

Cheers,

Dirkjan