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

[Georg Brandl]

Brett Cannon schrieb:

>>> Going the other direction works for me. Makes sense to have the
>>> changes percolate up the versions.
>>
>> The problem with that is it makes blocking individual revisions for
>> the py3k branch very hard.
>>
> 
> How so? Can't you just block the revision that handled the merge to
> the trunk? Or are you worried about the properties on '.' being
> merged?

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.

Georg

-- 
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.