[Python-checkins] r66799 - python/branches/release26-maint

["Martin v. Löwis"]

> The issue is that a merge of an arbitrary number of commits on 2.6 forms a
> single commit on trunk. If there are commits among them that should have
> been blocked for 3k, this isn't possible.
> 
> But as I said, this shouldn't occur too often, and if it does it can either
> be ignored (in the case of e.g. changes to 3k-removed modules) or merged
> separately to form a blockable revision on trunk.

I would advise against merging changes from the 2.6 branch to the trunk.
With such setup, 2.6 won't see many bug fixes, as all the bug fixes
committed to the trunk won't be merged at all.

Regards,
Martin