On Fri, Feb 4, 2011 at 17:31, Antoine Pitrou <solip...@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 _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
