This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author ncoghlan
Recipients eric.araujo, ezio.melotti, larry, ncoghlan
Date 2011-10-06.14:24:53
SpamBayes Score 5.9243557e-06
Marked as misclassified No
Message-id <1317911094.61.0.837987804948.issue13105@psf.upfronthosting.co.za>
In-reply-to
Content
This was from memory, so don't take it as gospel as far as the current security-fix-only branches go, but here's what I sent to Larry:

-----------------
We maintain two independent heads in hg: 2.7 and default

3.2 is open for general bugfixes

2.5 (IIRC), 2.6 and 3.1 are open for security fixes

Security fixes (if applicable to both heads) go:
2.5 -> 2.6 -> 2.7
3.1 -> 3.2 -> default

General bug fixes (if applicable to both heads) go:
2.7
3.2 -> default

New features are added to default only

The relative ordering of 2.x and 3.x changes doesn't really matter -
the important thing is not to merge them in *either* direction. I
think you can theoretically do cherry-picking with Hg, but most people
seem to just do independent commits to the two streams.
-----------------
History
Date User Action Args
2011-10-06 14:24:54ncoghlansetrecipients: + ncoghlan, larry, ezio.melotti, eric.araujo
2011-10-06 14:24:54ncoghlansetmessageid: <1317911094.61.0.837987804948.issue13105@psf.upfronthosting.co.za>
2011-10-06 14:24:54ncoghlanlinkissue13105 messages
2011-10-06 14:24:53ncoghlancreate