From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Andre Spiegel <spiegel@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: diff-apply-hunk broken
Date: Mon, 29 Mar 2004 10:10:57 +0200
Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Message-ID: <1080547857.5425.676.camel@localhost>
References: <uzna4zvbs.fsf@gnu.org>
	<m1hdwcq10x.fsf-monnier+emacs@empanada.local>
	<m17jx4mw0b.fsf-monnier+emacs@empanada.iro.umontreal.ca>
NNTP-Posting-Host: deer.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Trace: sea.gmane.org 1080548178 20883 80.91.224.253 (29 Mar 2004 08:16:18 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Mon, 29 Mar 2004 08:16:18 +0000 (UTC)
Cc: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Mar 29 10:16:06 2004
Return-path: <emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org>
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B7rwE-00046a-00
	for <emacs-devel@deer.gmane.org>; Mon, 29 Mar 2004 10:16:06 +0200
Original-Received: from monty-python.gnu.org ([199.232.76.173])
	by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B7rwD-0005uG-00
	for <emacs-devel@quimby.gnus.org>; Mon, 29 Mar 2004 10:16:06 +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 1B7rvr-0006WX-5W
	for emacs-devel@quimby.gnus.org; Mon, 29 Mar 2004 03:15:43 -0500
Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B7rsC-00046V-AA
	for emacs-devel@gnu.org; Mon, 29 Mar 2004 03:11:56 -0500
Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B7rrT-0003Uv-Mf
	for emacs-devel@gnu.org; Mon, 29 Mar 2004 03:11:44 -0500
Original-Received: from [193.113.160.15] (helo=mail.o2.co.uk)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B7rrK-0003FF-IZ
	for emacs-devel@gnu.org; Mon, 29 Mar 2004 03:11:02 -0500
Original-Received: from [217.81.119.54] (217.81.119.54) by mail.o2.co.uk (7.0.020)
	(authenticated as andre.spiegel@o2online.de)
	id 4063437400123C78; Mon, 29 Mar 2004 09:11:30 +0100
Original-To: Stefan Monnier <monnier@iro.umontreal.ca>
In-Reply-To: <m17jx4mw0b.fsf-monnier+emacs@empanada.iro.umontreal.ca>
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." <emacs-devel.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org
Xref: main.gmane.org gmane.emacs.devel:21048
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21048

On Mon, 2004-03-29 at 00:46, Stefan Monnier wrote:

> > In your case, clearly the new behavior is undesirable, so I think we need
> > to fix VC so that the diff doesn't mention io.d.~1.204.~.
> 
> I've just installed such a change in vc.el.
> Please try it and tell me how you like it,

Looks good to me.  Two questions, though: a local diff and a remote diff
now look exactly the same in the buffer.  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.

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).  Do you have any idea about the
general availability of -L in other diff implementations?