[Python-Dev] cpython: Revert unintended merge

[Matthias Klose]

On 04.12.2016 00:19, Martin Panter wrote:
> On 3 December 2016 at 22:15, Steve Dower <steve.dower at python.org> wrote:
>> On 03Dec2016 1312, Serhiy Storchaka wrote:
>>>
>>> On 03.12.16 22:13, steve.dower wrote:
>>>>
>>>> https://hg.python.org/cpython/rev/a60767015bed
>>>> changeset:   105436:a60767015bed
>>>> user:        Steve Dower <steve.dower at microsoft.com>
>>>> date:        Sat Dec 03 12:12:23 2016 -0800
>>>> summary:
>>>>   Revert unintended merge
>>>
>>>
>>> I suppose it should be reverted in the 3.6 branch too.
>>
>>
>> Maybe, but I didn't make the change in the 3.6 branch, so I have no idea
>> whether it is meant to be there or not. But it wasn't part of the change I
>> made, so I didn't want to merge it forward.
> 
> This change comes from Matthias (Doko), and was originally only in the
> 3.5 branch:
> https://hg.python.org/cpython/rev/14c80065c36e
> 
> I presume it was left unmerged until there is a branch for 3.6.1 to
> merge into. So Steve, when you did your first 3.5 → 3.6 merge, you
> merged Doko’s change into 3.6:
> 
> https://hg.python.org/cpython/rev/5171bd86a36f
> 
>> Someone who actually understands the implications of changing these files
>> (config.guess, config.sub) can figure it out :)

sorry about the confusion.  Noticed by other people as well.  The change should
be safe, only adding support for new targets which shouldn't affect current
architectures.  Now staying away from any other 3.5 updates until 3.6 is
released.  I'm usually trying to update these files before releases but maybe
was a bit late this time.

Matthias