changeset 36838 | c268ba15deb3 |
parent 36837 | 472c68cda3f8 |
child 37084 | f0b6fbea00cf |
--- a/mercurial/patch.py Tue Mar 06 07:45:57 2018 -0600 +++ b/mercurial/patch.py Sat Mar 10 19:49:09 2018 +0900 @@ -1120,9 +1120,10 @@ ui.warn(_("editor exited with exit code %d\n") % ret) continue # Remove comment lines - patchfp = open(patchfn) + patchfp = open(patchfn, r'rb') ncpatchfp = stringio() for line in util.iterfile(patchfp): + line = util.fromnativeeol(line) if not line.startswith('#'): ncpatchfp.write(line) patchfp.close()