[python-committers] Python 2.6.7rc2

[Barry Warsaw]

On May 20, 2011, at 03:12 PM, Guido van Rossum wrote:

>On Fri, May 20, 2011 at 2:37 PM, Barry Warsaw <barry at python.org> wrote:
>> I believe I've reconciled the Python 2.6 hg and svn branches.  I've committed
>> the changes to 2.6svn and working on the null merges for the 2.6hg branch.
>> I'll push the latter at some point soonish.  Anyway, this means that I will
>> cut 2.6.7rc2 today -- and actually announce it!
>
>I hope you did copy the SimpleHTTPServer.py security fix that I just
>commented on in the tracker.

I did.  Right now I'm blocked on a test failure for test_urllib2, but it's
failing in both the hg and svn branches, so at least it wasn't a result of a
bogus merge by me. ;)

(I also have a problem with the line-ending changes to various .bat files that
where only committed to hg26 but not svn26.  I need to resolve those before I
can push the reconciliation changes in Mercurial.)

>> In the future, if you are going to apply patches to Python 2.6, please do so
>> in both the hg and svn branches, since all 2.6 releases will be done from
>> svn.  If you're unsure or don't feel comfortable about doing that, please send
>> me the diff and I'll apply it to 2.6svn.  Or create/mark a bug as release
>> blocker on 2.6 and attach the patch.
>
>I'm not very happy with this requirement to do parallel checkins in hg
>and svn. IMO everyone except for the release managers should be able
>to live in the happy illusion that we've migrated to hg completely.
>
>Of course I'm fine with having very restrictive policies about
>checkins to hg branches for old versions where the releases are done
>from svn. The more restricted the better. But requiring individual
>developers to maintain parallel svn and hg trees is going too far.

I'm actually okay with that too, as long as the issue that precipitated the
commit isn't closed until it's been merged to 2.6svn.  Maybe that's the right
way to handle this then -- when you commit a fix to 2.6hg, be sure there's an
open release blocker issue on 2.6 with either a changeset or diff so that I
can do the cross-port.

And yes, we should still be very conservative about what lands in 2.5 and 2.6.

>> Thanks.  I probably don't need to say, no commits to the 2.6svn branch for
>> now please.
>
>Happy releasing!

Thanks!
-Barry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://mail.python.org/pipermail/python-committers/attachments/20110520/1a284cdc/attachment.pgp>