From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk documentation doesn't match implementation Date: Mon, 12 Mar 2007 20:19:27 +0100 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1173727197 19488 80.91.229.12 (12 Mar 2007 19:19:57 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 12 Mar 2007 19:19:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 12 20:19:46 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HQq3d-0002AT-S6 for ged-emacs-devel@m.gmane.org; Mon, 12 Mar 2007 20:19:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HQq4K-0001tE-9Q for ged-emacs-devel@m.gmane.org; Mon, 12 Mar 2007 14:20:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HQq49-0001rp-I0 for emacs-devel@gnu.org; Mon, 12 Mar 2007 15:20:17 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HQq47-0001om-NX for emacs-devel@gnu.org; Mon, 12 Mar 2007 15:20:16 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HQq47-0001oP-DB for emacs-devel@gnu.org; Mon, 12 Mar 2007 14:20:15 -0500 Original-Received: from mx2.suse.de ([195.135.220.15]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HQq3Q-0001I7-2u for emacs-devel@gnu.org; Mon, 12 Mar 2007 15:19:32 -0400 Original-Received: from Relay1.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 961252187B; Mon, 12 Mar 2007 20:19:29 +0100 (CET) X-Yow: I'll eat ANYTHING that's BRIGHT BLUE!! In-Reply-To: (Stefan Monnier's message of "Mon, 12 Mar 2007 14:54:03 -0400") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.91 (gnu/linux) X-detected-kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:67807 Archived-At: Stefan Monnier writes: > In your case, the patch specifies two files which diff-mode can both fi= nd, > yet, the patch is not between those two files (at least in your test ca= se, > the two files are just the same, presumably one being a "working tree" = and > the other being basically unrelated). The patch is relative to an older version of the file, my intention was t= o find out which parts of it have already been applied, and apply those tha= t aren't (and some hunks need editing to apply, so I couldn't just ignore the rejects). > Is your test case very representative, or are there many other differen= t > cases where you bump into the same problem? It's actually the first time I used that feature. For me this behaviour was very confusing, even before I read the doc string of diff-apply-hunk. Especially more so because it also automatically moves forward so that th= e effect is not immediately visible. Andreas. --=20 Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED= 5 "And now for something completely different."