Martin v. Löwis <mar...@v.loewis.de> added the comment:
> My apologies for not being more on top of this, but I couldn't find the
> answer in the developer FAQ. This question applies to issue 4566 and
> will partially apply to issue 5076. The patches are against the trunk -
> after checking in, what action should I take to ensure it is merged to
> 2.6 and 3.x? I'm happy to manually merge and checkin to those branches
> if appropriate; if so, should I check it into branches/release30-maint
> as well as branches/py3k?
If you want to backport the changes yourself, you should run
svnmerge.py; not sure how well this works on Windows, though (it invokes
an svn binary). The merge flow would be
trunk -> release26-maint
\-> py3k -> release30-maint
It's important to use svnmerge only, so that the merge tracking
properties are right.
In 2.6, do "svnmerge.py merge -r<rev>", then "svn commit -F
svnmerge-<tab>". In 3k, do the same, although you might have
to recompile the stubs in-between in case there are merge
conflicts on the binary files. In 3.0, do the same, but you
need to "svn revert .", because there will be merge conflicts
on ".".
If you don't want to perform all these operations, let me know,
and I'll do them.
_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue5075>
_______________________________________
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
