<br><br><div class="gmail_quote">On Sun, May 29, 2011 at 3:00 AM, Ned Deily <span dir="ltr"><<a href="mailto:nad@acm.org">nad@acm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Just a reminder and an FYI: the repo was left yesterday with an unmerged<br>
change leaving the 3.2 branch open. When you're finished pushing<br>
changes, it's always a good head idea to do an "hg branches" and make<br>
sure that only the default (py3k) and 2.7 branches are open:<br>
<br>
$ hg branches<br>
default 70473:e8e8a9dbc3c0<br>
2.7 70470:8349094d1fe8<br>
3.2 70472:791c64fdc405 (inactive)<br>
3.1 70471:bd49031b9488 (inactive)<br>
2.6 70460:23340842e920 (inactive)<br>
2.5 70459:0072a98566c7 (inactive)<br>
<br>
Since I needed to push some test failure fixes (Issue12205) before the<br>
2.7.2/3.1.4 cutoffs today, I took the liberty of doing a null merge to<br>
record. Greg, you might want to double-check that all is as you<br>
intended.<br>
<br>
changeset: 70469:ad3c204cc397<br>
parent: 70468:c5bd972391cd<br>
parent: 70465:4f248dd34dd9<br>
user: Ned Deily <<a href="mailto:nad@acm.org">nad@acm.org</a>><br>
date: Sun May 29 02:16:36 2011 -0700<br>
files: Lib/test/test_subprocess.py<br>
description:<br>
Null merge to record previous incorrecly merged changeset from 3.2<br></blockquote><div><br></div><div>Thanks. It looks like I did my merge incorrectly, I'll revisit my hg procedures.</div><div><br></div><div>*flogs self*</div>
<div>-gps</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
branch:<br>
changeset: 70465:4f248dd34dd9<br>
branch: 3.2<br>
parent: 70463:7f2e3c466d57<br>
user: Gregory P. Smith <<a href="mailto:greg@krypto.org">greg@krypto.org</a>><br>
date: Sat May 28 09:06:02 2011 -0700<br>
files: Lib/test/test_subprocess.py<br>
description:<br>
Fix ProcessTestCasePOSIXPurePython to test the module from import when<br>
<br>
changeset: 70466:2c91045d16a6<br>
parent: 70464:2936e8f12e4f<br>
user: Gregory P. Smith <<a href="mailto:greg@krypto.org">greg@krypto.org</a>><br>
date: Sat May 28 09:06:02 2011 -0700<br>
files: Lib/test/test_subprocess.py<br>
description:<br>
Fix ProcessTestCasePOSIXPurePython to test the module from import when<br>
<font color="#888888"><br>
--<br>
Ned Deily,<br>
<a href="mailto:nad@acm.org">nad@acm.org</a><br>
<br>
_______________________________________________<br>
python-committers mailing list<br>
<a href="mailto:python-committers@python.org">python-committers@python.org</a><br>
<a href="http://mail.python.org/mailman/listinfo/python-committers" target="_blank">http://mail.python.org/mailman/listinfo/python-committers</a><br>
</font></blockquote></div><br>