Looks like this has been done http://hg.python.org/cpython/rev/4c65f8641d89 http://hg.python.org/cpython/rev/2d33cbf02522

The graph looks OK to me. http://hg.python.org/cpython/graph

On Tue, Apr 15, 2014 at 7:36 AM, Eric V. Smith <eric@trueblade.com> wrote:

I responded to Vinay, but I haven't heard back. I'm forwarding here in case someone else is impacted.

I meant to make this change on the default branch only, but I accidentally made it on 3.4. If someone could revert it for me, I'd appreciate it. I'm away from a computer all day. I'll fix it when I get back.

-- Eric.

Begin forwarded message:

*From:* Vinay Sajip <vinay_sajip@yahoo.co.uk> *Date:* April 15, 2014 at 6:29:11 AM EDT *To:* Eric Smith <eric@trueblade.com> *Subject:* *CPython repository - changeset not merged into default from 3.4?* *Reply-To:* Vinay Sajip <vinay_sajip@yahoo.co.uk>

Hi Eric,

I made some changes in the Python 3.4 branch which I want to merge into default. I noticed that you made some changes in 3.4 in changeset 16efa8d27e4c which don't appear in default - is this intentional? Your changes are lumped in with mine when I try to merge :-(

Regards,

Vinay Sajip

---

python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers