[Python-checkins] r66863 - python/trunk/Modules/posixmodule.c

[Georg Brandl]

Martin v. Löwis schrieb:
> Raymond Hettinger wrote:
>>> Merges should be handled by the original committer.
>> 
>> Respectfully disagree.  Some people here having been taking
>> responsibility for keeping the branches in-sync 
> 
> Which people specifically?

Specifically, Christian, Benjamin and myself have done larger merges
to the 3k branch in the past, and if svnmerge is used, I suspect will
do the same for 2.6.

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.