From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Sun, 27 Sep 2009 21:08:12 -0400 Message-ID: References: <87skemzrre.fsf@marauder.physik.uni-ulm.de> <83r5u6wqvs.fsf@gnu.org> <20090917162612.l0stf7ln28gc4s8o@imap.uni-ulm.de> <20090918132946.w1z9vf7py8ow8ggo@imap.uni-ulm.de> <87skec9t1k.fsf@marauder.physik.uni-ulm.de> <83eipuu9dz.fsf@gnu.org> <87iqf68611.fsf@marauder.physik.uni-ulm.de> <834oqqt63w.fsf@gnu.org> <83d45csuqf.fsf@gnu.org> <87pr9c6s7l.fsf@marauder.physik.uni-ulm.de> Reply-To: Stefan Monnier , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254101249 5487 80.91.229.12 (28 Sep 2009 01:27:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Sep 2009 01:27:29 +0000 (UTC) To: 4451@emacsbugs.donarmstrong.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 28 03:27:22 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Ms51M-0003lU-04 for geb-bug-gnu-emacs@m.gmane.org; Mon, 28 Sep 2009 03:27:20 +0200 Original-Received: from localhost ([127.0.0.1]:40350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ms51L-0000E6-8D for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Sep 2009 21:27:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ms51G-0000Do-0T for bug-gnu-emacs@gnu.org; Sun, 27 Sep 2009 21:27:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ms51B-0000Bz-KC for bug-gnu-emacs@gnu.org; Sun, 27 Sep 2009 21:27:13 -0400 Original-Received: from [199.232.76.173] (port=40067 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ms51B-0000Bt-8R for bug-gnu-emacs@gnu.org; Sun, 27 Sep 2009 21:27:09 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:41108) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ms51A-0001Qz-Nw for bug-gnu-emacs@gnu.org; Sun, 27 Sep 2009 21:27:09 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8S1R6bG016870; Sun, 27 Sep 2009 18:27:06 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8S1F5iI014986; Sun, 27 Sep 2009 18:15:05 -0700 Resent-Date: Sun, 27 Sep 2009 18:15:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Mon, 28 Sep 2009 01:15:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4451 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4451-submit@emacsbugs.donarmstrong.com id=B4451.125410010014211 (code B ref 4451); Mon, 28 Sep 2009 01:15:04 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 28 Sep 2009 01:08:20 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from ironport2-out.pppoe.ca (ironport2-out.teksavvy.com [206.248.154.183]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8S18IlV014208 for <4451@emacsbugs.donarmstrong.com>; Sun, 27 Sep 2009 18:08:20 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvIEAMepv0pFxIo//2dsb2JhbACBUNBlgj6BYAWHfQ X-IronPort-AV: E=Sophos;i="4.44,462,1249272000"; d="scan'208";a="46681920" Original-Received: from 69-196-138-63.dsl.teksavvy.com (HELO pastel.home) ([69.196.138.63]) by ironport2-out.pppoe.ca with ESMTP; 27 Sep 2009 21:08:12 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 2C08C80C4; Sun, 27 Sep 2009 21:08:12 -0400 (EDT) In-Reply-To: <87pr9c6s7l.fsf@marauder.physik.uni-ulm.de> (Reiner Steib's message of "Sun, 27 Sep 2009 22:35:58 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Sun, 27 Sep 2009 21:27:13 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:31555 Archived-At: >> One interesting thing is that his --binary output seems to indicate >> that his file's revision 1.2 was using DOS-style EOLs wereas the >> current version is using Unix-style EOLs. So maybe that has >> something to do with the problem, indeed. > All revisions of the XML file _should_ have Unix-style EOLs. I'm not > 100% sure they have in the example I showed (I can't verify this > before October, sorry). But I had the very same symptoms with > different XML files. The reason why I think your file had DOS-style EOLs on revision 1.2 is that the --binary diff you showed had ^M^M^J on the "old text" and just ^M^J on the "new text". >> Also, of course it may also depend on the CVS version used on the >> repository's server. > The repository is on a mounted Windows share. Could it be that the RCS files accessed this way get an accidental LF->CRLF conversion done by the network-file-system? Seems pretty unlikely. But could you try and copy (part of) the repository to a local directory and try the operation again, just to rule out any funny business from this side? > BTW, why does `=' (`cvs-mode-diff') from PCL-CVS mode handle EOLs > different to VC? Because cvs-mode-diff applies to several files and doesn't presume that those files are probably currently visited in Emacs buffers, so it just always relies on Emacs's auto-detection instead. Sometimes it works well, but in general it's not as good as what VC does (typically diffs involving iso-2022 files in a "latin" locale don't decode the iso-2022 encoding). Stefan