Hello, For the record, due to a bug in the "hg graft" command, a recent changeset of mine basically merged branch 2.7 into 3.2:
$ hg log -r "ee8d999b6e05 or parents(ee8d999b6e05)" -G o changeset: 81129:ee8d999b6e05 |\ branch: 3.2 | | parent: 81124:e4ea38a92c4d | | parent: 81128:3436769a7964 | | user: Antoine Pitrou <solip...@pitrou.net> | | date: Fri Dec 28 19:07:43 2012 +0100 | | summary: Forward port new test for SSLSocket.connect_ex() | | | o changeset: 81128:3436769a7964 | | branch: 2.7 | | user: Antoine Pitrou <solip...@pitrou.net> | | date: Fri Dec 28 19:03:43 2012 +0100 | | summary: Backport Python 3.2 fix for issue #12065, and add another test for SSLSocket.connect_ex(). | | o | changeset: 81124:e4ea38a92c4d | | branch: 3.2 | | parent: 81118:b2cd12690a51 | | user: Serhiy Storchaka <storch...@gmail.com> | | date: Fri Dec 28 09:42:11 2012 +0200 | | summary: Issue #16761: Raise TypeError when int() called with base argument only. | | The first symptoms were reported in http://bz.selenic.com/show_bug.cgi?id=3748 but the actual cause of the issue is http://bz.selenic.com/show_bug.cgi?id=3667. Chances are the problem won't be very annoying in practice, but just FYI. Regards Antoine. _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
