[Python-Dev] [Python-checkins] cpython: merge

[Martin Panter]

On 2 February 2016 at 05:21, raymond.hettinger
<python-checkins at python.org> wrote:
> https://hg.python.org/cpython/rev/0731f097157b
> changeset:   100142:0731f097157b
> parent:      100140:c7f1acdd8be1
> user:        Raymond Hettinger <python at rcn.com>
> date:        Mon Feb 01 21:21:19 2016 -0800
> summary:
>   merge
>
> files:
>   Doc/library/collections.rst  |   4 ++--
>   Lib/test/test_deque.py       |  23 ++++++++++++-----------
>   Modules/_collectionsmodule.c |   7 ++-----
>   3 files changed, 16 insertions(+), 18 deletions(-)

This wasn’t actually a merge (there is only one parent). Hopefully I
fixed it up with <https://hg.python.org/cpython/rev/03708c680eca>. But
it looks like the original NEWS entry didn’t get merged in your
earlier merge <https://hg.python.org/cpython/rev/58266f5101cc>, so
there was nothing for me to merge the NEWS changes into in the default
branch.