[python-committers] branches and merging

[Georg Brandl]

Am 01.03.2010 23:44, schrieb Benjamin Peterson:
> 2010/3/1 Brett Cannon <brett at python.org>:
>>
>>
>> On Mon, Mar 1, 2010 at 09:31, Eric Smith <eric at trueblade.com> wrote:
>>> I've been doing it to remind myself of things that need to be merged, or
>>> not. And I believe it used to be used by people doing mass-merges, I'm not
>>> sure if that is done any more.
>>
>> Georg and Benjamin used to do it on occasion back when people did not do any
>> primary development in py3k or would just forget because it was not habit
>> yet.
> 
> FWIW, I don't worry about 2.6 or 3.1. I think it's of most importance
> that the trunk and py3k branch stay in sync, so I only block between
> those too branches.

I have also given up about 2.6 or 3.1 getting all bugfixes that are made.
I do still block my changes, since I mass-merge the others from time to time,
instead of merging them one by one.

Georg