[Python-Dev] Merges from 2.6 to 3.0?

[Skip Montanaro]

>> I don't know what svnmerge.py is ...

> As always, the dev FAQ has the answer you are looking for:
> http://python.org/dev/faq/#how-do-i-merge-between-branches .

OK, I ran svnmerge, resolved conflicts, ran the tests, checked in the
changes with the commit message svnmerge generated.  Am I supposed to block
either the earlier revision (65605) from being merged from trunk to py3k or
the later revision (65611) from being merged from py3k to trunk?

Thx,

Skip