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: Mon, 05 Oct 2009 14:45:43 -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> <20091005180753.1mcmt2jzswoko048@imap.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 1254769644 6784 80.91.229.12 (5 Oct 2009 19:07:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 Oct 2009 19:07:24 +0000 (UTC) Cc: 4451@emacsbugs.donarmstrong.com To: Reiner Steib Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 05 21:07:21 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 1Musu1-0002l3-G9 for geb-bug-gnu-emacs@m.gmane.org; Mon, 05 Oct 2009 21:07:21 +0200 Original-Received: from localhost ([127.0.0.1]:38804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Musu1-0004ER-Jk for geb-bug-gnu-emacs@m.gmane.org; Mon, 05 Oct 2009 15:07:21 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mustx-0004DJ-0k for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 15:07:17 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Musts-000438-45 for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 15:07:16 -0400 Original-Received: from [199.232.76.173] (port=43279 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mustr-00042q-SD for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 15:07:11 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:52055) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mustr-0000nQ-6E for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 15:07:11 -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 n95J78hr025707; Mon, 5 Oct 2009 12:07:09 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n95It6jp023225; Mon, 5 Oct 2009 11:55:06 -0700 Resent-Date: Mon, 5 Oct 2009 11:55:06 -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, 05 Oct 2009 18:55:06 +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.125476834722433 (code B ref 4451); Mon, 05 Oct 2009 18:55:06 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 5 Oct 2009 18:45:47 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from chene.dit.umontreal.ca (chene.dit.umontreal.ca [132.204.246.20]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n95Ijiwa022430 for <4451@emacsbugs.donarmstrong.com>; Mon, 5 Oct 2009 11:45:46 -0700 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n95IjiHY019454; Mon, 5 Oct 2009 14:45:44 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id EBED73A0D6; Mon, 5 Oct 2009 14:45:43 -0400 (EDT) In-Reply-To: <20091005180753.1mcmt2jzswoko048@imap.uni-ulm.de> (Reiner Steib's message of "Mon, 05 Oct 2009 18:07:53 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3377=0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Mon, 05 Oct 2009 15:07:16 -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:31706 Archived-At: > `vc-coding-system-for-diff' is called 2 times when I do `C-x v =' > 1) > vc-coding-system-for-diff("c:/Users/x123456/tmp/check-out/K3.xml") > vc-diff-internal(t (CVS ("c:/Users/x123456/tmp/check-out/K3.xml")) nil > nil t) > vc-diff(nil t) > call-interactively(vc-diff nil nil) > 2) > vc-coding-system-for-diff("c:/Users/x123456/tmp/check-out/K3.xml") > vc-cvs-diff(("c:/Users/x123456/tmp/check-out/K3.xml") nil nil "*vc-diff*") > apply(vc-cvs-diff (("c:/Users/x123456/tmp/check-out/K3.xml") nil nil > "*vc-diff*")) > vc-call-backend(CVS diff ("c:/Users/x123456/tmp/check-out/K3.xml") nil > nil "*vc-diff*") > vc-diff-internal(t (CVS ("c:/Users/x123456/tmp/check-out/K3.xml")) nil > nil t) > vc-diff(nil t) > call-interactively(vc-diff nil nil) Looks like vc-cvs-diff sets up the coding system redundantly. >> One possibility for this mistake might be that Diff produces >> inconsistent EOL format in its output, for example if Diff or its VC >> front-end outputs some headers that have Unix EOLs and then the actual >> diffs with DOS EOLs. > The repository file (K3.xml,v) has Unix EOLs. But if I do a fresh > checkout, I get a file K3.xml with DOS EOLs (I think this is the usual > behavoir of the Windows cvs binaries[1] for text files unless you > specify the switch "-ko"). However, in my workflow I overwrite the file > with a Unix EOL file (exported from some application), do modifications, > diffs and check it in. Well, that's probably a good explanation for why you see the problem and others don't: overwriting a file with another is not exaclty standard practice in revision-control-systems. I'm surprised that CVS doesn't consider that every line in the file is modified (AFAIK that's what it does if you copy the DOS-EOL version of a file atop a Unix-EOL file). IOW: don't do that. Either convince CVS to use Unix-EOLs on this file, or use DOS-EOLs. Stefan