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

[Georg Brandl]

Benjamin Peterson schrieb:

>>> Which is why I would have preferred merging in the other direction.
>>>
>>> Merging only manually loses one important factor of using svnmerge in the
>>> first place: not overlooking revisions to merge.
>>>
>>
>> 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.

Well, they can be merged to trunk in a separate svnmerge commit. Since they
shouldn't occur too often, this isn't as tiresome as the blocking used now.

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.