[Python-checkins] cpython (merge 3.5 -> default): Null merge.

[Terry Reedy]

On 9/29/2016 12:26 AM, Zachary Ware wrote:
> On Wed, Sep 28, 2016 at 10:04 PM, Terry Reedy <tjreedy at udel.edu> wrote:
>> On 9/28/2016 9:57 PM, terry.reedy wrote:
>>>
>>> https://hg.python.org/cpython/rev/02eb35b79af0
>>> changeset:   104148:02eb35b79af0
>>> parent:      104144:f222508de71a
>>> parent:      104147:f02b8e7f6995
>>> user:        Terry Jan Reedy <tjreedy at udel.edu>
>>> date:        Wed Sep 28 21:57:25 2016 -0400
>>> summary:
>>>   Null merge.
>>
>>
>> (2nd try) I mistakenly null merged from 3.5 to default.
>> Should a now do a proper null merge from 3.5 to 3.6 to default?
>> Should I revert this null merge?
>
> You aren't the only one who's missed 3.6 since it was branched :).  If
> there are changes in 3.5 that should not be in 3.6, you should go
> ahead and do a null merge from 3.5 -> 3.6 -> default.  If the changes
> in 3.5 are already in 3.6, I'd just leave it as is; it will clear up
> when somebody next merges something.

As Martin noticed, the News items and acks were already in 3.6b1.