[Python-checkins] r60965 - python/trunk/Lib/test/test_builtin.py

[Guido van Rossum]

On Fri, Feb 22, 2008 at 1:47 PM, Brett Cannon <brett at python.org> wrote:
>  Just so Christian doesn't yell at me, I tried to block the change I
>  made for test_logging as that will require a lot of manual tweaking,
>  but svnmerge.py said I couldn't. I suspect it has to do with the fact
>  I didn't try to block immediately and other blocks had subsequently
>  already been set.

That sounds odd. AFAIK blocks are just cumulative. Are you sure you
did the blocking on the py3k branch?

>  I will see if I can do the review of the alternative test_logging
>  implementation using unittest tonight and get that in as that might be
>  easier to convert over using 2to3.
>
>  I assume you really only want stuff blocked that 2to3 might choke on
>  or should just not be backported, right?

It works the other way around. Normally when you make a change to the
trunk it will be merged into the py3k branch. Sometimes you don't want
this to happen, e.g. when it's a 2.6-only feature, or when it's a
backport to 2.6 of code that's already in 3.0. Then you block that rev
(which modified the trunk) in the py3k branch.

-- 
--Guido van Rossum (home page: http://www.python.org/~guido/)