[Python-Dev] Merging flow

Benjamin Peterson musiccomposition at gmail.com
Thu Dec 4 18:30:43 CET 2008

On Thu, Dec 4, 2008 at 11:23 AM, Mark Dickinson <dickinsm at gmail.com> wrote:
> On Thu, Dec 4, 2008 at 3:12 PM, Christian Heimes <lists at cheimes.de> wrote:
>> 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.
> Thanks, Christian!
> Questions:
> (1) If I commit a change to the trunk that I don't want to go into
> release26-maint, should I explicitly block it using svnmerge?
> (2) Same question for trunk -> py3k
> (3) Same question for py3k -> release30-maint.
> I'm guessing that the answers are (1) No, (2) Yes, (3) No.

That is correct. We don't care too much about blocking for the release branches.

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

More information about the Python-Dev mailing list