[python-committers] branches and merging

Eric Smith eric at trueblade.com
Mon Mar 1 10:16:41 CET 2010
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.

Eric.



More information about the python-committers mailing list