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

[Brett Cannon]

On Fri, Feb 22, 2008 at 3:24 PM, Guido van Rossum <guido at python.org> wrote:
> On Fri, Feb 22, 2008 at 3:10 PM, Brett Cannon <brett at python.org> wrote:
> > On Fri, Feb 22, 2008 at 2:03 PM, Guido van Rossum <guido at python.org>
> wrote:
>  >  > 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?
> >
> >  Yep (according to ``svn info``):
>  >
> >   URL: svn+ssh://pythondev@svn.python.org/python/branches/py3k
> >
> >
> >  And here is what happens (using svnmerge.py straight out of
>  >  Subversion's repository):
> >
> >   > svnmerge block -r 60872 .
> >   svnmerge: no available revisions to block
> >
> >
> >  So I have no clue what is going on.
>
> That rev was already integrated. Look:
>
> $ svn propget svnmerge-blocked .
> /python/trunk:60480,60521-60522,60528-60529,60534,60539,60599,60707,60713,60879,60893,60899,60932,60962
> $ svn propget svnmerge-integrated .
> /python/trunk:1-60479,60481-60520,60523-60527,60530-60533,60535-60538,60540-60598,60600-60706,60708-60712,60714-60878,60880-60892,60894-60898,60900-60931,60933-60958
>  $

Ah, that would explain it. =) I was trying to keep an eye on merges;
must have missed that one.

-Brett