Re: [Python-Dev] hg merge flow