[Python-Dev] [Python-checkins] Would someone please help me merge these changes to other branches?

R. David Murray rdmurray at bitdance.com
Sun Mar 20 17:33:32 CET 2011


On Sun, 20 Mar 2011 10:10:02 -0500, skip at pobox.com wrote:
> > I pushed two changes to cpython yesterday and today.  I don't know how to
> > merge them to the 2.7 and 3.2 branches, and don't want to even try for
> > fear of screwing something up.  If what I read in python-dev yesterday is
> > correct, I did things incorrectly by starting with cpython instead of 2.7
> > or 3.2.
> 
> Actually, the newline= change only needs to go to 3.2.  The RFC 4180 change
> can also go to 2.7.

I'd already started on this fix, so I incorporated your changes (except
for the RFC 4180 one) and made them on 3.1, 3.2, and harmonized default.
So this should all be good now, except for the RFC change.  I guess I'll
see about doing that one later.

--
R. David Murray           http://www.bitdance.com


More information about the Python-Dev mailing list