[Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): Merge #15232: correctly mangle From lines in MIME preamble and epilogue (original) (raw)

Meador Inge meadori at gmail.com
Mon Jul 23 16:17:33 CEST 2012

On Mon, Jul 23, 2012 at 12:34 AM, Meador Inge <meadori at gmail.com> wrote:

On Sun, Jul 22, 2012 at 8:55 PM, r.david.murray <python-checkins at python.org> wrote:

http://hg.python.org/cpython/rev/80b81658455b changeset: 78246:80b81658455b parent: 78244:c43d73277756 parent: 78245:b97f65f2298d user: R David Murray <rdmurray at bitdance.com> date: Sun Jul 22 21:53:54 2012 -0400 summary: Merge #15232: correctly mangle From lines in MIME preamble and epilogue

files: Lib/email/generator.py | 12 ++++++++- Lib/test/testemail/testemail.py | 22 +++++++++++++++++++ Misc/NEWS | 3 ++ 3 files changed, 35 insertions(+), 2 deletions(-) I'm not quite sure what happened, but something seems to have gone wrong with this merge. After doing the following while on the "default" branch: $ hg merge 3.2 I see: $ hg st M Lib/email/generator.py M Lib/test/testemail/testemail.py M Misc/NEWS and a bunch of conflicts in 'Misc/NEWS'.

Hmmm, actually it looks like this head merge that Senthil performed: http://hg.python.org/cpython/rev/af2e044609ca.

Anyway, I resolved the conflicts.

-- Meador

More information about the Python-Dev mailing list