Re: [Monotone-devel] Re: Bug in CRLF conversions

[Richard Levitte - VMS Whacker]

In message <address@hidden> on Sun, 29 Jan 2006 17:20:59 -0800, Larry Hastings 
<address@hidden> said:

larry> Speaking as a Windows developer, let me pitch in with a couple thoughts:
[...]
larry>     * Personally I'd prefer it if monotone stored text files in
larry>       some canonical format, and converted to/from local format
larry>       on sync / commit.  Normalizing eols to just LFs seems
larry>       fine to me, as would stripping out the payload from
larry>       $Foo:$ tags (not that monotone handles those yet, I
larry>       gather).  Two people checking in the "same" file, where
larry>       they differ only by the local eol convention, should
larry>       result in generating the same hash.

That's what happens today.

larry>     * How should it normalize text files with inconsistent
larry>       eols?  If I'm on Windows, and I check in a file with CR
larry>       LF LF, what should it do?  I suggest monotone use the
larry>       following heuristic, regardless of the local platform:
larry>       when you first see either CR or LF, store an LF.  If the
larry>       next character is the other eol character, ignore it.

That's what happens today (in your specific example, you end up with
LF LF internally unless your get_linesep_conv says something
different).

Cheers,
Richard

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis