Re: [Monotone-devel] Re: line endings with 0.31

[Brian May]

>>>>> "Graydon" == Graydon Hoare <address@hidden> writes:

    Graydon> Woah! Did we really leave it like this? That's
    Graydon> terrible. We added an attribute to files called
    Graydon> mtn:manual_merge that controls whether the merger
    Graydon> believes it can do line-merging on the file or whether
    Graydon> the file should be treated as binary. Can't we assume
    Graydon> that mtn:manual_merge implies "don't do the linesep /
    Graydon> charset conversion on i/o"? Or can we rephrase the
    Graydon> attribute as mtn:blob, or such? Users should not have to
    Graydon> muck about with this linesep conversion function stuff,
    Graydon> if possible.

I have to agree myself, its not very good. Another option would be if
the file already exists, and you can automatically parse it using some
algorithm to guess if it is binary or not (perhaps with the file
command).

I personally prefer the attribute approach, although, admittedly,
there is the risk that you will corrupt a binary file by checking it
in as ascii.

Another option would be to replace the lua function with one that
reads in a list of regular expressions from an external file. I don't
think this would be as good because it wouldn't set per each
repository.
-- 
Brian May <address@hidden>