
On Thu, Dec 4, 2008 at 10:12 AM, Christian Heimes <lists@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? 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. Jeremy
Christian
_______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/jeremy%40alum.mit.edu