On May 21, 2011, at 12:19 AM, Martin v. Löwis wrote:
Am 20.05.2011 23:37, schrieb Barry Warsaw:
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.
At the moment, this wouldn't be possible, since the svn is blocked from accepting commit unless they come from you or me.
It would be better, IMO, if there was a single developer who would migrate changes to svn, or to have some semi-automatic procedure for that.
Yep. It's rather a pain to determine what those changes are though if the best you can do is a recursive diff on the two trees.
What do you think about my response to Guido, specifically: if you commit a change to 2.6hg, be sure there's a release blocker issue open on 2.6 so that I can easily find what needs to be cross-ported.
-Barry