[Python-checkins] r79486 - python/branches/release30-maint/Doc/library/itertools.rst

[Nick Coghlan]

Ezio Melotti wrote:
> Also you should use "svnmerge.py merge -r xxxxx" to merge commits,
> committing first on trunk, then using svnmerge to port to
> release26-maint and py3k and finally to backport the py3k commit to
> release31-maint.

Raymond's not using svnmerge is a historical quirk from when svnmerge
was first introduced as an optional tool to help manage the repository.

To gain acceptance of the new tool, it was made clear that existing
committers could keep doing what they were used to doing (i.e. manual
backports and forward ports) and those pushing for the adoption of
svnmerge would take care of recording the fact that those merges had
happened.

That exception is actually still in effect, it's just that a lot of us
have switched to using svnmerge anyway. Since we also tell any new
committers to use it, we tend not to advertise the existence of the
"legacy workflow" clause all that much :)

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia
---------------------------------------------------------------