From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: Why did every line in w32fns.c get a ^M? Date: Thu, 1 Jul 2010 19:03:42 +0200 Message-ID: References: <83sk439lt2.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1278004223 24615 80.91.229.12 (1 Jul 2010 17:10:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 17:10:23 +0000 (UTC) Cc: lekktu@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 01 19:10:19 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 1OUNHC-0006DY-KP for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 19:10:14 +0200 Original-Received: from localhost ([127.0.0.1]:38331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUNHC-0002vx-0G for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 13:10:14 -0400 Original-Received: from [140.186.70.92] (port=57968 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUNGu-0002nZ-UV for emacs-devel@gnu.org; Thu, 01 Jul 2010 13:10:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUNGo-0008Qn-BH for emacs-devel@gnu.org; Thu, 01 Jul 2010 13:09:56 -0400 Original-Received: from mail-ww0-f49.google.com ([74.125.82.49]:34801) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUNGo-0008Qf-49; Thu, 01 Jul 2010 13:09:50 -0400 Original-Received: by wwi14 with SMTP id 14so2152432wwi.30 for ; Thu, 01 Jul 2010 10:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=BWcOW5bYTyg0srTIxlMpnxh/Xi0N1DHgSkHANhg3o7g=; b=YSYWQKmPp7WL60lyVp4z3WKLXM4YXecsXsNbQ7PU+5aYTe8nzfzE0ZX/18bitVowi7 VIdCTkycsb8yZB4/Wy8snx9U9oGdsk+iQzacqV1BY1lqZZmFEECN5j7GCFzcQW1g88W1 8zB/FyeMhpwsibm2944fd3lKmDkgPBQluhD2s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=Anw7ZSJP9iumWKmtcOBxqEwDaxvWT0NJ5tuUYYLuAS+ThNbD6+gwd7sa6yDS0VPnza BmdxC4ZmgNrColIxmBkqZOM0VC/8GfCB70wfb2z/yz9AamQU8hZAV/c9dpbhiAHoQUQK Lhu3DjQOXu1b20BwNK4VFo4euVYXpA1ub/Rkc= Original-Received: by 10.213.17.7 with SMTP id q7mr198429eba.21.1278003842401; Thu, 01 Jul 2010 10:04:02 -0700 (PDT) Original-Received: by 10.213.15.132 with HTTP; Thu, 1 Jul 2010 10:03:42 -0700 (PDT) In-Reply-To: <83sk439lt2.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:126642 Archived-At: On Thu, Jul 1, 2010 at 7:03 PM, Eli Zaretskii wrote: >> 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 wr= ote: >> > >> >> 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. =C2=A0Even in your case, it did help you identify the problem right > away, didn't it? I think it is rather stupid actually. It could have warned me of the situation instead. > 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). Thanks.