[Python-Dev] Merging flow

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. Christian