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