From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Sep 2008 23:40:54 +0000 (+0000)
Subject: Blocked revisions 66498,66502,66504,66506 via svnmerge
X-Git-Tag: v3.0rc2~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b68828cf98aa9a23c6afc6afd9b7c0b05b65bd7c;p=python

Blocked revisions 66498,66502,66504,66506 via svnmerge

........
  r66498 | mark.hammond | 2008-09-17 21:47:35 -0500 (Wed, 17 Sep 2008) | 4 lines

  On Windows, temporarily disable the bsddb test referenced in bug 3892.
  We do yell to stderr and the bug is marked as a blocker.
  Reviewed by barry in #python-dev.
........
  r66502 | mark.hammond | 2008-09-17 22:51:46 -0500 (Wed, 17 Sep 2008) | 3 lines

  avoid putting unicode objects in the environment causing
  later test failures.  As discussed on #python-dev
........
  r66504 | barry.warsaw | 2008-09-17 23:33:43 -0500 (Wed, 17 Sep 2008) | 1 line

  Bumping to 2.6rc2
........
  r66506 | barry.warsaw | 2008-09-18 00:34:31 -0500 (Thu, 18 Sep 2008) | 1 line

  done with 2.6rc2
........
---