[Python-Dev] Merging flow

[Benjamin Peterson]

On Thu, Dec 4, 2008 at 12:18 PM, Jeremy Hylton <jeremy at alum.mit.edu> wrote:
> On Thu, Dec 4, 2008 at 10:12 AM, Christian Heimes <lists at cheimes.de> wrote:
>> Several people have asked about the patch and merge flow. Now that Python
>> 3.0 is out it's a bit more complicated.
>>
>> Flow diagram
>> ------------
>>
>> trunk ---> release26-maint
>>       \->      py3k       ---> release30-maint
>>
>>
>> Patches for all versions of Python should land in the trunk. They are then
>> merged into release26-maint and py3k branches. Changes for Python 3.0 are
>> merged via the py3k branch.
>
> You say "they are then merged."  Does that mean if I commit something
> on the trunk, someone else will merge it for me?  Or do I need to do
> it?

Generally, somebody else will do it if it is on the trunk and bound
for py3k. (Bug fixes should be backported by the original committer.)
Of course, if the change required in py3k is complicated and vastly
different, I and the other mergers would appreciate it if you did it
yourself.

>
> The library is vastly different between 2.x and 3.x.  I'm personally
> aware of the many changes related to httplib / urllib / xmlrpclib.
> I'm worried that it will be hard to decide how to "merge" things
> between the two versions.

Feel free to do it yourself.

>
> Jeremy




-- 
Cheers,
Benjamin Peterson
"There's nothing quite as beautiful as an oboe... except a chicken
stuck in a vacuum cleaner."