From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#26028: 26.0.50; epatch for multifile patches Date: Wed, 08 Mar 2017 21:17:12 +0200 Message-ID: <838tofh93b.fsf@gnu.org> References: <87varjfzhr.fsf@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1489000701 18720 195.159.176.226 (8 Mar 2017 19:18:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 8 Mar 2017 19:18:21 +0000 (UTC) Cc: 26028@debbugs.gnu.org To: Arseny Sher Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Mar 08 20:18:17 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clh6B-0003pX-F3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 08 Mar 2017 20:18:11 +0100 Original-Received: from localhost ([::1]:58030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clh6H-0005Tm-DN for geb-bug-gnu-emacs@m.gmane.org; Wed, 08 Mar 2017 14:18:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clh66-0005S9-BS for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 14:18:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clh62-0000VI-Va for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 14:18:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clh62-0000V7-T4 for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 14:18:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1clh62-0003Sc-Mh for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 14:18:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Mar 2017 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26028 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 26028-submit@debbugs.gnu.org id=B26028.148900066813257 (code B ref 26028); Wed, 08 Mar 2017 19:18:02 +0000 Original-Received: (at 26028) by debbugs.gnu.org; 8 Mar 2017 19:17:48 +0000 Original-Received: from localhost ([127.0.0.1]:46658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clh5o-0003Rk-Ci for submit@debbugs.gnu.org; Wed, 08 Mar 2017 14:17:48 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:58094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clh5n-0003RY-4g for 26028@debbugs.gnu.org; Wed, 08 Mar 2017 14:17:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clh5e-0000Hf-Qx for 26028@debbugs.gnu.org; Wed, 08 Mar 2017 14:17:42 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clh5e-0000Ha-NS; Wed, 08 Mar 2017 14:17:38 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1507 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1clh5d-00061c-Lt; Wed, 08 Mar 2017 14:17:38 -0500 In-reply-to: <87varjfzhr.fsf@yandex.ru> (message from Arseny Sher on Wed, 08 Mar 2017 20:29:52 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:130351 Archived-At: > From: Arseny Sher > Date: Wed, 08 Mar 2017 20:29:52 +0300 > > ars@ars-thinkpad ~/tmp $ mkdir -p old/src > ars@ars-thinkpad ~/tmp $ echo "void main() { }" > old/src/hello.c > ars@ars-thinkpad ~/tmp $ mkdir -p new/src > ars@ars-thinkpad ~/tmp $ echo "int main() { return 0; }" > new/src/hello.c > ars@ars-thinkpad ~/tmp $ diff -cr old/ new/ > tmp.patch > ars@ars-thinkpad ~/tmp $ cat tmp.patch > diff -cr old/src/hello.c new/src/hello.c > *** old/src/hello.c 2017-03-08 14:29:24.743846995 +0300 > --- new/src/hello.c 2017-03-08 14:29:32.399846824 +0300 > *************** > *** 1 **** > ! void main() { } > --- 1 ---- > ! int main() { return 0; } > > > Now I start emacs and do M-x epatch. First of all, it asks me for > patch buffer or file, I point to '~/tmp/tmp.patch'. Then it asks for > directory to patch, I say '~/tmp/old' and ediff complains > > Ediff has inferred that > /home/ars/tmp/old/hello.c > is assumed to be the target for this patch. However, this file does not exist. I think you should point it to ~/tmp, not ~/tmp/old. IOW, the directory should be the one relative to which the file names in the patch file will correctly point to the files.