[python-committers] [Python-checkins] cpython (merge 2.7 -> 2.7): merge heads.

Martin Panter vadmium+py at gmail.com
Fri Sep 4 13:13:02 CEST 2015

Previous message (by thread): [python-committers] [Python-checkins] cpython (merge 2.7 -> 2.7): merge heads.
Next message (by thread): [python-committers] [RELEASED] Python 3.5.0rc3 is now available
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 3 September 2015 at 10:03, Senthil Kumaran <senthil at uthcode.com> wrote:
> I did a merge head with Victor's change in 2.7 before pushing my change.
> Can someone confirm if I did it right? If anything was wrong, how to correct
> it?

It looks like you did it right. If I compare the merge result with the
second merge parent (Victor’s commits)

hg diff -p -r d687912d499f^2 -r d687912d499f

I get just your three-line diff to test_wsgiref.py, as I would expect.

Previous message (by thread): [python-committers] [Python-checkins] cpython (merge 2.7 -> 2.7): merge heads.
Next message (by thread): [python-committers] [RELEASED] Python 3.5.0rc3 is now available
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the python-committers mailing list