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!
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. Thanks. I probably don't need to say, no commits to the 2.6svn branch for now please. -Barry
signature.asc
Description: PGP signature
_______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
