Re: [Monotone-devel] Re: Line endings produced by internal 3-way merge

[Nathaniel Smith]

On Fri, Dec 02, 2005 at 02:49:30PM -0800, graydon hoare wrote:
> Joe Hull wrote:
> >I believe I'm observing that when monotone successfully completes an
> >internal three-way merge the resulting merged file always uses a LF as
> >its line ending no matter what the line ending convention of the host
> >system or the line endings of the three source files for the three-way
> >merge.
> 
> Oh. That's incorrect. Would you mind opening a bug on this? It ought to 
> be reasonably easy to correct (especially in rosters, where we have much 
> more precise merging of attributes, and can just look at the attribute 
> on the resulting file)

Hmm, even if there's no attr, though, we should be respecting the line
endings of the files that came in.  Maybe it would make sense to
define linesplit("foo\nbar\nbaz\n") to be ["foo\n", "bar\n", "baz\n"]
instead of ["foo", "bar", "baz"]?

This also means that line ending differences will cause conflicts (I
assume they don't right now, if we're stripping line ending
characters), but that seems appropriate as a default behavior...

-- Nathaniel

-- 
So let us espouse a less contested notion of truth and falsehood, even
if it is philosophically debatable (if we listen to philosophers, we
must debate everything, and there would be no end to the discussion).
  -- Serendipities, Umberto Eco