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

Jeffrey Yasskin jyasskin at gmail.com
Thu Dec 11 01:12:02 CET 2008

Was there ever a conclusion to this? I need to merge the patches associated with issue 4597 from trunk to all the maintenance branches, and I'd like to avoid messing anyone up if possible. If I don't hear back, I'll plan to svnmerge directly from trunk to each of the branches, and then block my merge to py3k from being merged again to release30-maint.

Thanks, Jeffrey

On Thu, Dec 4, 2008 at 7: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. Christian

More information about the Python-Dev mailing list