On Mon, Mar 1, 2010 at 09:31, Eric Smith <e...@trueblade.com> wrote: > Gregory P. Smith wrote: > >> On Mon, Mar 1, 2010 at 1:16 AM, Eric Smith <e...@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. >>> >>> Eric. >>> >> >> 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. >
Georg and Benjamin used to do it on occasion back when people did not do any primary development in py3k or would just forget because it was not habit yet. > > 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. I say we keep doing it in case someone does one last blind merge before we switch to Hg. -Brett
_______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
