I'm sure you already have it under control, but TextWrangler can change encoding as easy as "Save As..."

Best, Dave Nathanson KG6ZJO

On Jul 18, 2014, at 3:27 PM, chirp.cordless@xoxy.net wrote:

On Jul 18, 2014, at 3:06 PM, Dan Smith - dsmith@danplanet.com wrote:

...

I just saved the raw email out of thunderbird on a mac and it had standard rfc822 CRLF endings:

theine:chirp.hg dan$ file test.patch test.patch: ASCII English text, with CRLF line terminators

Trying to hg import it failed exactly as it did for you: ... I converted it to LF-only and it applied just fine:

theine:chirp.hg dan$ file test.patch test.patch: ASCII English text

Good luck!

That helps more than you might have expected. The problem isn't the line termination, it's the character encoding, I think. On my system, your patch save from Mail.app:

dan[Desktop]$ file dsmith.patch.txt dsmith.patch.txt: UTF-8 Unicode English text

My patch generated from hg:

dan[dev_work1]$ file 1767.patch 1767.patch: ASCII English text

I can't get to this immediately, but I'm sure I can figure out how to convert UTF-8 to ASCII, which I think means UTF-7. Or save it that way from Mail.app. Maybe copy/paste 8-) I'm probably self-contained for now, but I won't be getting back to this right away.

-dan

In case you prefer bottom posting:

I'm sure you already have it under control, but TextWrangler can change encoding as easy as "Save As..."

Best, Dave Nathanson KG6ZJO