If you use svnmerge properly you won't have to block anything in this case.
Blocking is used to mark revs that are applied to 2.6 but should *not* apply to 3.0. We never merge from py3k to the trunk, only from the trunk to py3k. --Guido On Sat, Aug 9, 2008 at 12:50 PM, Skip Montanaro <[EMAIL PROTECTED]> wrote: >>> 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 > > > > _______________________________________________ > Python-Dev mailing list > Python-Dev@python.org > http://mail.python.org/mailman/listinfo/python-dev > Unsubscribe: > http://mail.python.org/mailman/options/python-dev/guido%40python.org > -- --Guido van Rossum (home page: http://www.python.org/~guido/) _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
