fixeol & eol was Line ending translation extension

Steve Borho steve at borho.org
Sun Sep 6 23:26:39 CDT 2009


On Sun, Sep 6, 2009 at 8:10 PM, Dj Gilcrease<digitalxero at gmail.com> wrote:
> While looking at all the hgrc options and thinking about how to deal
> with issues brought up about how to handle patches with different line
> endings then are native on the system I saw that [merge-tools] has a
> boolean setting of fixeol, and [patch] has a eol setting with strict,
> crlf, lf as options.
>
> What does fixeol of true attempt to do?
>
> Proposal, add decode to the patch.eol config setting so it will use
> the decode filters to normalize the file, and if the particular file
> does not fall under a filter it would default to strict

Certain well-known merge tools (aka kdiff3) will write out merge
results in the machine default line endings regardless of the line
endings of the source files.  fixeol detects that the line endings
were changed by the merge tool and recovers them to the line endings
of the first parent.

--
Steve Borho


More information about the Mercurial-devel mailing list