[PATCH 0 of 1] patch: create .rej without eol transformation

Shun-ichi Goto shunichi.goto at gmail.com
Sun Dec 5 06:23:20 CST 2010


This patch fix the issue of creating incorrect .rej file having CRCRLF.

I got this issue by using mq on Windows (CRLF files) with eol
extension which forces patch.eol=auto on loading.
Note that this is not a platform dependent issue.

It can be reproduced:
 1. file has CRLF line ending (like windows file)
 2. patch hunk has CRLF lines.
 3. patch.eol=auto
 4. do patch (i.e. using qpush)
 5. .rej file has CRCRLF when patch is failed. <= incorrect

A test is added in test-mq-eol.t and it can run on UNIX and Windows.

P.S.
The commit message is corrected as suggested by timeless in mailing list.
The test is updated to run on Windows and describe the issue in it.


More information about the Mercurial-devel mailing list