win32ext and patch.eol

Steve Borho steve at borho.org
Sun Jun 14 14:58:27 UTC 2009


On Sun, Jun 14, 2009 at 6:12 AM, Patrick Mézard<pmezard at gmail.com> wrote:
> I have implemented but not pushed yet the following thing:
>
> """
> [[patch]]
> patch::
>  Settings used when applying patches, for instance through the 'import'
>  command or with Mercurial Queues extension.
>  eol;;
>    When set to 'strict' patch content and patched files end of lines
>    are preserved. When set to 'lf' or 'crlf', both files end of lines
>    are ignored when patching and the result line endings are
>    normalized to either LF (Unix) or CRLF (Windows).
>    Default: strict.
> """
>
> This setting is used by import, mq, transplant and record. These commands usually fail when win32ext is enabled.
>
> How do we integrate both?
>
> I am tempted to silently set "patch.eol=crlf" in win32ext.uisetup() if the option is unset. I am not aware of any other case where enabling an extension changes option values, what do you think about it?

This is the least bad approach I've heard for this problem.

--
Steve Borho




More information about the Mercurial-devel mailing list