[PATCH 1 of 1] patch: generate .rej wihtout eol adaptation

timeless timeless at gmail.com
Fri Dec 3 03:51:39 CST 2010


Please spell checker your summaries and commit messages.

On Thu, Dec 2, 2010 at 2:10 PM, Shun-ichi Goto <shunichi.goto at gmail.com> wrote:
> # Date 1291291758 -32400
> # Node ID 28946a4e335acd72a8fbf308f9010ed786922539
> # Parent  cec6140b0f3c8c00515dbf3589068d1e2d233fdf
> patch: generate .rej wihtout eol adaptation

"without"

Your commit message should describe the new behavior, not the old behavior.
> When patch.eol=auto and patch has CRLF content, filepatch generates
> incorrect .rej file having CRCRLF. This is because
> patchfile.write_rej() uses patchfile.writelines() which makes eol
> adaptation although self.rej data is not normalized.

So this paragraph probably doesn't belong.

> This changeset add optional boolean argument 'strict' to omit eol
> adaptation and use it for .rej generation.

Adds an optional boolean argument 'strict' to skip eol transformations.

This should be a test (.t), not in the commit message:
> To reproduce this issue:
>  1. make taget file having CRLF line ending
>  2. make patch file having CRLF content line ending
>  3. prepare patch which would conflict
>  4. applying patch with option 'patch.eol=auto'
>  5. check .rej file has CRCRLF <= incorrect!


More information about the Mercurial-devel mailing list