From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Why did every line in w32fns.c get a ^M? Date: Thu, 1 Jul 2010 13:46:44 +0200 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: dough.gmane.org 1277984838 12966 80.91.229.12 (1 Jul 2010 11:47:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 1 Jul 2010 11:47:18 +0000 (UTC) Cc: Emacs-Devel devel To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 01 13:47:15 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 1OUIEd-0001qc-Ai for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 13:47:15 +0200 Original-Received: from localhost ([127.0.0.1]:37373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUIEc-0007NW-RN for ged-emacs-devel@m.gmane.org; Thu, 01 Jul 2010 07:47:14 -0400 Original-Received: from [140.186.70.92] (port=59094 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUIEX-0007MS-C4 for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:47:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUIEW-0004QZ-5W for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:47:09 -0400 Original-Received: from mail-fx0-f41.google.com ([209.85.161.41]:64258) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUIEV-0004QS-W8 for emacs-devel@gnu.org; Thu, 01 Jul 2010 07:47:08 -0400 Original-Received: by fxm17 with SMTP id 17so1340718fxm.0 for ; Thu, 01 Jul 2010 04:47:04 -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; bh=BocC3gs+XpZ5Ir2aUXMSvdue1kPcP4xcEVGMOtap0mo=; b=AA+KqU45X7xTaT6W99iSi+754OwcK4OBNjS69pCIpz1AWmvspZ3fRCvvwlvr7Ejv7d 88PAt9tU/0caEYGlwkXVeUOJD8zmy0f49fDojL+p8XXMaAdnooaf5rW9WGXMNV2+9d3P eXB+GPZHBAzveTUPV8zoJZl6+p2QFDf0GNf3s= 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; b=gMI8Ib0OWt6+cGQkLNWJBxpwUQQio6xac3aIY4xwp52iIE15tDWKRZj1856UsdP+tI ZMqVTokvhnbGneSlCNo1/WvX7NCIrfu15ochPEb0N2YLM82cK8aQpFvxVm1bfsikPR5b yiunZIF5Miv1O+ZQXRIL1fOu4qsNG5D2/fGjE= Original-Received: by 10.204.5.195 with SMTP id 3mr7241680bkw.193.1277984824189; Thu, 01 Jul 2010 04:47:04 -0700 (PDT) Original-Received: by 10.204.66.77 with HTTP; Thu, 1 Jul 2010 04:46:44 -0700 (PDT) In-Reply-To: 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:126613 Archived-At: On Thu, Jul 1, 2010 at 13:36, Lennart Borgman wrote: > But it looks like w32fns.c somehow got saved with CRLF line endings (I > have no idea why) I don't think it was Bazaar, so you're the likely culprit somehow... :-) > 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. Juanma