[Python-Dev] [Python-checkins] cpython (merge 3.3 -> 3.3): merge heads (original) (raw)

Benjamin Peterson benjamin at python.org
Sat Oct 13 04:40:55 CEST 2012

2012/10/12 Chris Jerdonek <chris.jerdonek at gmail.com>:

On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson <python-checkins at python.org> wrote:

http://hg.python.org/cpython/rev/de8787029fe4 changeset: 79702:de8787029fe4 branch: 3.3 parent: 79701:d4ab5859721e parent: 79690:0cddf0bd19f8 It looks like this 3.3 check-in also reverted previous valid work. The following command shows the diff from the "mainline", which isn't visible in the e-mail contents below: hg diff -r 0cddf0bd19f8 -r de8787029fe4 It's hard for me to piece together exactly what happened, or else I would try to fix it myself.

Sorry about that. I merged 3.2 -> default instead of 3.2 -> 3.3 -> default and these were my attempts to fix it.

-- Regards, Benjamin

More information about the Python-Dev mailing list