EOL: patch.eol=auto setting

[Martin Geisler]

Hi guys,

I've pushed my patches that adds a patch.eol=auto setting. The old
'crlf' and 'lf' settings had the effect that line endings were ignored
completely while merging, and the file was written out in the requested
format. The 'auto' setting also ignores line endings, but files are
written in the same format as they were read in.

The goal is to keep the working directory files in the same format as we
found them. This allows us to apply a patch that touch files with both
CRLF and LF line-endings, without coercing all files into the same EOL
format. I've added a test for this in the eol extension:

  http://bitbucket.org/mg/hg-eol/changeset/ff3176ddb382/#chg-tests/test-eol-patch

I've Cc'ed the people that were active in the last EOL thread... please
grab these revisions (or a later revision) and try things out:

  http://hg.intevation.org/mercurial/crew/rev/1720d70cd6d4
  http://bitbucket.org/mg/hg-eol/changeset/ff3176ddb382/

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091220/f882a24a/attachment.pgp>