[python-committers] branches and merging
eric at trueblade.com
Mon Mar 1 18:31:13 CET 2010
Gregory P. Smith wrote:
> 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.
>> Use svnmerge.py. Commit to trunk, then merge to py3k. You'll probably want
>> to block release26-maint and release31-maint.
> Why bother explicitly blocking it in release26-maint and
> release31-maint? That just seems like extra svn makework given it
> won't be merged into those branches anyways as a matter of policy.
Because the FAQ tells me to do so!
I've been doing it to remind myself of things that need to be merged, or
not. And I believe it used to be used by people doing mass-merges, I'm
not sure if that is done any more.
A few of us discussed this at the sprint. I think an official policy on
the issue would be a good thing, since people are of 2 minds about it.
More information about the python-committers