From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andre Spiegel Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk broken Date: Tue, 30 Mar 2004 16:56:06 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <1080658566.29736.101.camel@localhost> References: <1080547857.5425.676.camel@localhost> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1080658820 11683 80.91.224.253 (30 Mar 2004 15:00:20 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 30 Mar 2004 15:00:20 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue Mar 30 17:00:03 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 1B8Kih-0004n2-00 for ; Tue, 30 Mar 2004 17:00:03 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B8Kih-0000JF-00 for ; Tue, 30 Mar 2004 17:00:03 +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 1B8Khe-0008Jf-1J for emacs-devel@quimby.gnus.org; Tue, 30 Mar 2004 09:58:58 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B8KhP-0008IG-7f for emacs-devel@gnu.org; Tue, 30 Mar 2004 09:58:43 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B8Kgn-0008A8-Ty for emacs-devel@gnu.org; Tue, 30 Mar 2004 09:58:38 -0500 Original-Received: from [193.113.160.14] (helo=mail.o2.co.uk) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B8Key-0007kw-1y for emacs-devel@gnu.org; Tue, 30 Mar 2004 09:56:12 -0500 Original-Received: from [217.224.230.120] (217.224.230.120) by mail.o2.co.uk (7.0.020) (authenticated as andre.spiegel@o2online.de) id 40646CED00155359; Tue, 30 Mar 2004 15:55:17 +0100 Original-To: Stefan Monnier In-Reply-To: X-Mailer: Ximian Evolution 1.4.5 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:21092 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21092 On Mon, 2004-03-29 at 16:19, Stefan Monnier wrote: > Actually, no: the remote diff has some extra lines before the diff itself. > At least with CVS it does. But: why do you care? I find it valuable feedback when I can see at a glance whether a diff was computed locally or remotely. A simple example where it might help is this: A user makes a mistake setting up his vc-cvs-stay-local variable. As a result, he gets remote diffs when he actually wants them to be local. If he can't tell from the output what happened, it might be difficult for him to realize the problem. But if the disply is still different anyway, that's enough of a visual clue I think. > > 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'. What version are you referring to? In GNU diffutils 2.8.1-6 (Debian unstable), diff -L is neither mentioned in the manpage, the info manual, nor diff --help. The -L option is mentioned, however, for diff3 (in all three places). As far as I can tell, 2.8.1 is the most recent version. Please confirm whether you have a version where diff -L is documented. Otherwise, I'll file a bug report to the diffutil guys.