[Python-Dev] Preventing merges into Py3k

[Guido van Rossum]

On Feb 12, 2008 9:44 AM, thomas.heller <python-3000-checkins at python.org> wrote:
> Author: thomas.heller
> Date: Tue Feb 12 18:44:23 2008
> New Revision: 60746
>
> Modified:
>    python/branches/py3k/Modules/_ctypes/_ctypes.c
> Log:
> Revert the last svnmerge (r60681) from trunk to _ctypes.c, it should
> not have been merged as was noticed in the commit message.

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?

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