[Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): Correctly merging #9319 into 3.3?

[Jesus Cea]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

If a patch in 3.2 is not applicable in 3.3, a "null merge" should be
done. If not, next developer tring to merge will find some other
unrelated code to merge, and she doesn't have the context knowledge to
know what to do :-).

In this case, I merged code that doesn't actually compile, breaking the
build for 20 minutes :-).

And yes, I fully realized that I should try to compile locally first.
Dealing with this unexpected merge when merging my own patch was...
unexpected, and the code seemed sensible enough.

Do we have some hat-of-shame I should wear because breaking the build? :).

- -- 
Jesus Cea Avion                         _/_/      _/_/_/        _/_/_/
jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
jabber / xmpp:jcea at jabber.org         _/_/    _/_/          _/_/_/_/_/
.                              _/_/  _/_/    _/_/          _/_/  _/_/
"Things are not so easy"      _/_/  _/_/    _/_/  _/_/    _/_/  _/_/
"My name is Dump, Core Dump"   _/_/_/        _/_/_/      _/_/  _/_/
"El amor es poner tu felicidad en la felicidad de otro" - Leibniz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQCUAwUBTbTgpplgi5GaxT1NAQJqegP3QSVIf6yszZrFJEgKTaK4XXvHB965PdYN
T9g8bx5IKXmiMjDBCatjuA2AAtwnL0Wd2Dw0tnGhRTqYHD2l+cMcFw/2JtV4L6sC
c0fKm2o+V8gSW7KZwdvgNWiQlzE3lp2DiD/ng3gM3JlK/EKghIH8acDiJsHHrQtS
7T7iSLllOw==
=+50u
-----END PGP SIGNATURE-----