Re: Why did every line in w32fns.c get a ^M?

[Eli Zaretskii]

> From: Lennart Borgman <address@hidden>
> Date: Thu, 1 Jul 2010 14:56:31 +0200
> Cc: Emacs-Devel devel <address@hidden>
> 
> On Thu, Jul 1, 2010 at 1:46 PM, Juanma Barranquero <address@hidden> wrote:
> >
> >> and it looks like bzr merge could not handle that at all.
> >
> > How could it? If the local copy suddenly has CRLF in every line, *all*
> > lines have changed and it has no anchors to detect where to apply
> > incoming changes.
> 
> You mean bzr can't be smart enough to recognize different line
> endings? Of course not if it considers everything as binary, but that
> is not necessary.

I actually think the default Bazaar operation regarding EOLs is very
nice.  Even in your case, it did help you identify the problem right
away, didn't it?

But if you don't like the default and want to get yourself into more
trouble, read the section "End of Line Conversion" in the Bazaar User
Reference manual (in the "Concepts" chapter).