[python-committers] branches and merging

[Steven Bethard]

On Mon, Mar 1, 2010 at 1:16 AM, Eric Smith <eric at trueblade.com> wrote:
> Steven Bethard wrote:
>>
>> I'm preparing the argparse module for the 2.7 and 3.2 branches. Could
>> someone remind me again what the commit process is? Commit to 2.7 and
>> merge to 3.2? And do we merge with svnmerge.py or svn merge? There's
>> probably a webpage explaining this somewhere, but my Google-fu is
>> failing me right now.
>
> http://www.python.org/dev/faq/#how-do-i-merge-between-branches
>
> Use svnmerge.py. Commit to trunk, then merge to py3k. You'll probably want
> to block release26-maint and release31-maint.

Thanks, and done in r78576 (trunk) and r78577 (py3k). I also went
ahead and blocked the two maintenance releases (in r78578 and r78579).
Hopefully everything went smoothly! Let me know if I screwed anything
up. =)

Steve
-- 
Where did you get that preposterous hypothesis?
Did Steve tell you that?
        --- The Hiphopopotamus