From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Why did every line in w32fns.c get a ^M? Date: Thu, 01 Jul 2010 20:03:21 +0300 Message-ID: <83sk439lt2.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1278003694 22613 80.91.229.12 (1 Jul 2010 17:01:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 17:01:34 +0000 (UTC) Cc: lekktu@gmail.com, emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 01 19:01:33 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OUN8l-0001RP-VD for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 19:01:32 +0200 Original-Received: from localhost ([127.0.0.1]:59843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUN8l-0006ab-F0 for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 13:01:31 -0400 Original-Received: from [140.186.70.92] (port=57472 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUN8b-0006Mw-Mv for emacs-devel@gnu.org; Thu, 01 Jul 2010 13:01:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUN8W-0007JC-P9 for emacs-devel@gnu.org; Thu, 01 Jul 2010 13:01:21 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:49500) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUN8W-0007J7-IZ for emacs-devel@gnu.org; Thu, 01 Jul 2010 13:01:16 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L4W00L001T9FZ00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Thu, 01 Jul 2010 20:01:14 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.12.240]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L4W00JJO1Y1YX50@a-mtaout23.012.net.il>; Thu, 01 Jul 2010 20:01:14 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:126640 Archived-At: > From: Lennart Borgman > Date: Thu, 1 Jul 2010 14:56:31 +0200 > Cc: Emacs-Devel devel > > On Thu, Jul 1, 2010 at 1:46 PM, Juanma Barranquero 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).