[python-committers] branches and merging

[Georg Brandl]

Am 01.03.2010 09:44, schrieb Steven Bethard:
> 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.

You'll commit to 2.7 and then merge to 3.2.  You also should block the
original commit in 2.6, and the 3.2 commit in 3.1.  svnmerge usage is
described in the dev FAQ:

http://www.python.org/dev/faq/#how-do-i-merge-between-branches

About the docs: I see argparse already uses Sphinx, so the format is fine.
We usually have only one page per module though; if the total length isn't
more than that of e.g. logging (which is one of the larger documents) I'd
like to have all-in-one.

Georg

-- 
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.