From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk broken Date: 29 Mar 2004 09:19:24 -0500 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <1080547857.5425.676.camel@localhost> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1080570059 9368 80.91.224.253 (29 Mar 2004 14:20:59 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 29 Mar 2004 14:20:59 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Mar 29 16:20:48 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B7xdA-0007fr-00 for ; Mon, 29 Mar 2004 16:20:48 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B7xdA-00035w-00 for ; Mon, 29 Mar 2004 16:20:48 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B7xd2-0001UD-J1 for emacs-devel@quimby.gnus.org; Mon, 29 Mar 2004 09:20:40 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B7xcL-0001TK-Rg for emacs-devel@gnu.org; Mon, 29 Mar 2004 09:19:57 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B7xbp-0001N3-LN for emacs-devel@gnu.org; Mon, 29 Mar 2004 09:19:56 -0500 Original-Received: from [206.47.199.141] (helo=simmts12-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B7xbp-0001Mx-C8; Mon, 29 Mar 2004 09:19:25 -0500 Original-Received: from empanada.local ([67.71.118.2]) by simmts12-srv.bellnexxia.net (InterMail vM.5.01.06.05 201-253-122-130-105-20030824) with ESMTP id <20040329141924.RRGO25455.simmts12-srv.bellnexxia.net@empanada.local>; Mon, 29 Mar 2004 09:19:24 -0500 Original-Received: by empanada.local (Postfix, from userid 502) id 7C64414AC0E; Mon, 29 Mar 2004 09:19:24 -0500 (EST) Original-To: Andre Spiegel In-Reply-To: <1080547857.5425.676.camel@localhost> Original-Lines: 33 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:21054 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21054 > Looks good to me. Two questions, though: a local diff and a remote diff > now look exactly the same in the buffer. Actually, no: the remote diff has some extra lines before the diff itself. At least with CVS it does. But: why do you care? > Perhaps it would be good to add something like "(local)" after the version > number, in a way that wouldn't confuse diff-mode (or patch, for that > matter)? Just a thought. I don't see the need, but anything after the first TAB can be changed at will (i.e. you can remove the date or replace it with something else, for example). > Second, I couldn't find documentation for the "-L" option in the GNU > diff manual, although it is quite happy with that option (--label, which > seems equivalent, is documented). The manpage definitely mentions -L as does `diff --help'. > Do you have any idea about the general availability of -L in other > diff implementations? It's also there in Mac OS X (which is using a version derived from BSD, which is itself derived from an older GNU code it seems) which is the only non-GNU system to which I have access. Actually, the -L args are used in smerge-mode since Emacs-21.1 and I haven't heard any complaint about it. Admittedly, I'd expect much fewer people use smerge-mode's diff than VC's diff, so maybe it's not so simple. Stefan