[python-committers] Fwd: CPython repository - changeset not merged into default from 3.4?

[Eric V. Smith]

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 at yahoo.co.uk>
> Date: April 15, 2014 at 6:29:11 AM EDT
> To: Eric Smith <eric at trueblade.com>
> Subject: CPython repository - changeset not merged into default from 3.4?
> Reply-To: Vinay Sajip <vinay_sajip at 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
> 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-committers/attachments/20140415/f9e33cc8/attachment.html>