[Python-3000] Preventing merges into Py3k

[Christian Heimes]

Guido van Rossum wrote:
> There is a way to prevent merging a particular revision by instructing
> svnmerge properly. I believe the syntax is svnmerge block (svnmerge
> help block will explain you more).
> 
> Christian has been using this -- Christian, care to post a detailed example?

Yes, svnmerge.py block is correct. In order to prevent a merge you have
to use svnmerge.py in a local copy of the py3k branch. Don't forget to
submit the change! ;)

cd .../py3k
svnmerge.py block -r12345
svn ci -m "block r12345"

Christian