Re: [python-committers] branches and merging

2010-03-01 Thread Martin v. Löwis
> The hold-up will ultimately be the EOL extension and the updated docs > now that Dirkjan has a patch for sys.mercurial. Is that patch published somewhere? I'd like to take a look. Regards, Martin ___ python-committers mailing list python-committers@py

Re: [python-committers] branches and merging

2010-03-01 Thread Jesus Cea
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/01/2010 11:24 PM, Barry Warsaw wrote: > Maybe we should consider switching to hg now rather than waiting? I can't wait for HG. I have read the main cutprit for the delay is the line-ending issue with MS Windows developers. Is there anything else

Re: [python-committers] branches and merging

2010-03-01 Thread Brett Cannon
On Mon, Mar 1, 2010 at 14:24, Barry Warsaw wrote: > On Mar 01, 2010, at 02:06 PM, Brett Cannon wrote: > > >Well, if we are already screwed if we do a blind merge we might as well > stop > >wasting our time on doing blocks since that is the only real use case for > >bothering. > > Maybe we should

[python-committers] 2.6.5

2010-03-01 Thread Barry Warsaw
The tarballs for Python 2.6.5 rc1 have been uploaded, the branch tagged, and the website fiddled. I want to semi-unfreeze the release26-maint branch. Since this was a release candidate, only patches fixing release blockers, or other brown paper bag bugs will be allowed. Contact me via email, bug

Re: [python-committers] branches and merging

2010-03-01 Thread Benjamin Peterson
2010/3/1 Brett Cannon : > > > On Mon, Mar 1, 2010 at 09:31, Eric Smith wrote: >> 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 d

[python-committers] Fw: [Python-checkins] r78573 - python/tags/r265rc1

2010-03-01 Thread Barry Warsaw
Hi Martin and Ronald, We are tagged for 2.6.5 rc 1. Please let me know when the installers are uploaded. -Barry --- Begin Message --- Author: barry.warsaw Date: Mon Mar 1 23:26:23 2010 New Revision: 78573 Log: Tagging for 2.6.5 rc 1 Added: python/tags/r265rc1/ - copied from r78572,

Re: [python-committers] branches and merging

2010-03-01 Thread Barry Warsaw
On Mar 01, 2010, at 02:06 PM, Brett Cannon wrote: >Well, if we are already screwed if we do a blind merge we might as well stop >wasting our time on doing blocks since that is the only real use case for >bothering. Maybe we should consider switching to hg now rather than waiting? (Well, by "now"

Re: [python-committers] branches and merging

2010-03-01 Thread Brett Cannon
On Mon, Mar 1, 2010 at 13:10, "Martin v. Löwis" wrote: > > I say we keep doing it in case someone does one last blind merge before > > we switch to Hg. > > That would fail terribly, as there are tons of unblocked changes that > shouldn't be merged, either. > > I don't want to argue about policy a

[python-committers] Python 2.6.5 rc 1

2010-03-01 Thread Barry Warsaw
Remember, I am cutting the 2.6.5 rc 1 release today, probably in about 90 minutes. I have a patch to commit for bug 7250, which unfortunately doesn't appear to be unit-testable. :( I'm hoping someone will be able to test this in a live environment. Please refrain from committing anything to the

Re: [python-committers] branches and merging

2010-03-01 Thread Martin v. Löwis
> I say we keep doing it in case someone does one last blind merge before > we switch to Hg. That would fail terribly, as there are tons of unblocked changes that shouldn't be merged, either. I don't want to argue about policy at this point, but I don't feel particularly bad myself when I forget

Re: [python-committers] branches and merging

2010-03-01 Thread Brett Cannon
On Mon, Mar 1, 2010 at 09:31, Eric Smith wrote: > Gregory P. Smith wrote: > >> On Mon, Mar 1, 2010 at 1:16 AM, Eric Smith 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? Co

Re: [python-committers] branches and merging

2010-03-01 Thread Eric Smith
Gregory P. Smith wrote: On Mon, Mar 1, 2010 at 1:16 AM, Eric Smith 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 merg

Re: [python-committers] branches and merging

2010-03-01 Thread Gregory P. Smith
On Mon, Mar 1, 2010 at 1:16 AM, Eric Smith 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 >>

Re: [python-committers] branches and merging

2010-03-01 Thread Eric Smith
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

Re: [python-committers] branches and merging

2010-03-01 Thread 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 so

[python-committers] branches and merging

2010-03-01 Thread 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. T