[Python-Dev] Merging flow (original) (raw)

Georg Brandl g.brandl at gmx.net
Thu Dec 4 22:22:50 CET 2008

Christian Heimes schrieb:

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.

As a side-note: this merging flow means that bugfix and feature commits may never be merged from trunk to py3k in one svnmerge batch. Else, they cannot be separated when merging from py3k to 30-maint.

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.

More information about the Python-Dev mailing list