[MERGE] integrated EOL conversion support

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matt Doran wrote:
> Ian Clatworthy wrote:
>> Matt Doran wrote:
>>   Repository format is important because:
>>
>> 1. It determines what gets checked out in the absence of any rules.
>>
>> 2. Projects have existing files with crlf committed and we don't want
>>    to normalise all existing files to a single internal convention:
>>    that would cause annotate and other commands grief because all
>>    text files using something other than lf now would essentially
>>    "reset" w.r.t who contributed what lines.
>>
>>   
> Fair enough, I think I need to digest this a bit more.  We make heavy
> use of SVN and eol-style and I'm considering a transition to bzr.
> What seems a little strange to me is that the EOL decision can be made
> by each end-user through their local configuration.  It is flexible, but
> is it too flexible? :)

Actually, it seems to me that storage format should be a project-wide
decision, but local format should be a local configuration (e.g. some
Windows users don't want or need CRLF on disk for source files).

> I'm not very familiar with "branch.conf", but that doesn't seem to be a
> versioned file.   Is there some way to provide versioned configuration
> through this scheme to allow a project to mandate particular
> rules/configuration?

No.  We can propagate rules like this at branch time, but we currently
don't have a form of versioned configuration.  There are several things
it would be nice for: tags and commit message updates come to mind.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknQ3gMACgkQ0F+nu1YWqI1kzACfbk8W0bLBkrEwFliarVNIKN0r
vg4An0Uru3Ax+erI+rXg9T8pTZZFWmbV
=wjrW
-----END PGP SIGNATURE-----