[Python-Dev] Merges from 2.6 to 3.0?

[Guido van Rossum]

On Sat, Aug 9, 2008 at 7:40 AM,  <skip at pobox.com> wrote:
> Are big merges from the trunk still being made to the py3k branch?  I
> checked in a change to csv.DictReader on the trunk yesterday evening.  I
> will port it to py3k if necessary, but I was under the impression that the
> merge gnomes are constantly busy at work behind the scene.  If this activity
> has been curtailed because we are nearly late betas or something, let me
> know and I'll do it myself.

They's still happening, as irregularly scheduled as ever. However if
you think your change requires any kind of manual help to be merged,
it's better to do the merge yourself for just that revision:
svnmerge.py merge -rNNNNN. That way it'll be recorded as merged and a
later big merge will skip it.

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