From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#4451: 23.1; EOL problems with vc-diff and cygwin Date: Sat, 26 Sep 2009 12:20:19 +0300 Message-ID: <834oqqt63w.fsf@gnu.org> 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> Reply-To: Eli Zaretskii , 4451@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1253957248 32230 80.91.229.12 (26 Sep 2009 09:27:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 26 Sep 2009 09:27:28 +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 Sat Sep 26 11:27: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 1MrTYl-0006gF-OV for geb-bug-gnu-emacs@m.gmane.org; Sat, 26 Sep 2009 11:27:20 +0200 Original-Received: from localhost ([127.0.0.1]:47620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrTYk-0007EF-Vc for geb-bug-gnu-emacs@m.gmane.org; Sat, 26 Sep 2009 05:27:18 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MrTYg-0007EA-2f for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 05:27:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MrTYa-0007Da-Ea for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 05:27:13 -0400 Original-Received: from [199.232.76.173] (port=57590 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MrTYa-0007DM-60 for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 05:27:08 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:38223) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MrTYZ-0006xu-Ja for bug-gnu-emacs@gnu.org; Sat, 26 Sep 2009 05:27:07 -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 n8Q9R564001275; Sat, 26 Sep 2009 02:27:05 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n8Q9P5BU000820; Sat, 26 Sep 2009 02:25:05 -0700 Resent-Date: Sat, 26 Sep 2009 02:25:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Eli Zaretskii Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Sat, 26 Sep 2009 09:25:05 +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.125395672732341 (code B ref 4451); Sat, 26 Sep 2009 09:25:05 +0000 Original-Received: (at 4451) by emacsbugs.donarmstrong.com; 26 Sep 2009 09:18:47 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mtaout5.012.net.il (mtaout5.012.net.il [84.95.2.13]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n8Q9Ijxb032338 for <4451@emacsbugs.donarmstrong.com>; Sat, 26 Sep 2009 02:18:46 -0700 Original-Received: from conversion-daemon.i_mtaout5.012.net.il by i_mtaout5.012.net.il (HyperSendmail v2004.12) id <0KQK00H00N536R00@i_mtaout5.012.net.il> for 4451@emacsbugs.donarmstrong.com; Sat, 26 Sep 2009 12:18:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.126.56.156]) by i_mtaout5.012.net.il (HyperSendmail v2004.12) with ESMTPA id <0KQK004ZLN6GP9A0@i_mtaout5.012.net.il>; Sat, 26 Sep 2009 12:18:17 +0300 (IDT) In-reply-to: <87iqf68611.fsf@marauder.physik.uni-ulm.de> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Sat, 26 Sep 2009 05: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:31528 Archived-At: > From: Reiner Steib > Cc: 4451@emacsbugs.donarmstrong.com, Stefan Monnier > Date: Sat, 26 Sep 2009 10:27:38 +0200 > > On Fri, Sep 25 2009, Eli Zaretskii wrote: > > >> From: Stefan Monnier > [...] > >> Eli didn't seem convinced about it. And it may cause poor results > >> in other cases as well. I'm not familiar enough with the issue (which > >> seems to be very w32-specific and depend heavily on the particular > >> diff.exe tool you use), to make a good judgment call. > > > > What would be good is to investigate the original problem thoroughly > > and post the exact reason(s) of the failure. Reiner, could you perhaps > > do that? > > I think I posted all data you asked for, or did I forget something? You posted the data I asked for, yes (thanks!), but what I'm asking now is different. What I'd like to see is where in Emacs sources we examine the output we get from Diff, and where and why we err as to what EOL format should be used for decoding that output. 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. Another possibility is that somewhere along the chain of processing the output, we force EOL conversion to be Unix-style, instead of detecting EOLs dynamically, or maybe even forcing it to DOS (if we have clear evidence for doing the latter). It could also be some mix of these. These are just the hypotheses; only by tracing the processing through its stages and taking notes for every stage that deals with decoding output from external processes or from temporary files, it will be possible to establish facts and determine what and where goes wrong. TIA