From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#26028: 26.0.50; epatch for multifile patches Date: Thu, 09 Mar 2017 10:41:18 +0900 Message-ID: <87d1drfcqp.fsf@calancha-pc> References: <87varjfzhr.fsf@yandex.ru> <838tofh93b.fsf@gnu.org> <87y3wfv3iy.fsf@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1489023740 23776 195.159.176.226 (9 Mar 2017 01:42:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 9 Mar 2017 01:42:20 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: Michael Heerdegen , 26028@debbugs.gnu.org, tino.calancha@gmail.com To: Arseny Sher Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 09 02:42:15 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 1cln5n-0004rt-3Q for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Mar 2017 02:42:11 +0100 Original-Received: from localhost ([::1]:59977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cln5o-00025Z-0m for geb-bug-gnu-emacs@m.gmane.org; Wed, 08 Mar 2017 20:42:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cln5i-00025U-B1 for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 20:42:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cln5f-0002vx-7U for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 20:42:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cln5f-0002vr-3f for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 20:42:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cln5e-0007f8-JZ for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2017 20:42:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 09 Mar 2017 01:42: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.148902369029417 (code B ref 26028); Thu, 09 Mar 2017 01:42:02 +0000 Original-Received: (at 26028) by debbugs.gnu.org; 9 Mar 2017 01:41:30 +0000 Original-Received: from localhost ([127.0.0.1]:46894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cln58-0007eP-Jq for submit@debbugs.gnu.org; Wed, 08 Mar 2017 20:41:30 -0500 Original-Received: from mail-pg0-f68.google.com ([74.125.83.68]:35924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cln57-0007eA-9a for 26028@debbugs.gnu.org; Wed, 08 Mar 2017 20:41:29 -0500 Original-Received: by mail-pg0-f68.google.com with SMTP id 25so5043345pgy.3 for <26028@debbugs.gnu.org>; Wed, 08 Mar 2017 17:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=NaEyJDCIJJ54qBrPMJWETcbC7WV05KF8m/ehN5zwmHc=; b=DevZkp+ViUx5Hv5LJeTYLSnH45ukCYl1rCAyzQ7ByznqwE/35bL/tmN28kiAhfhGG9 rDFQpOsAXH1p3G4N35dkadRDpxOyQavVIwgZpTca3DziUCW5pNc+Iuqdyp7/Yk+yY0xy zTw9olvCzGHZpqt6d6e1jzuqTMV6lC8IbanUOmT8pmAk3slNX4PssA1RSwEtRlZ37xON rjPVLarVltn/q/Y5wQT4Kw8r3pCukRHjsyUGwVAJHqwfpTX5sTbcrWH6UUjDmZlRt9Sg htE8+ZwZajTUJSFJ4f23PBGejUXbqCVftWt9iESrlHYG8v0zkiV0Ld0gDzQYpPknNHdS cxbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=NaEyJDCIJJ54qBrPMJWETcbC7WV05KF8m/ehN5zwmHc=; b=KgXPIX7t79pJ49kKDsskYQreoRRQwQIXqoSKisG6OGZAF/k+iXHPI/ktE5waGGgT1w QXOGvR0mCV0X/el24OqqesVl1/zCnSqthg29nK5I4NvT/vvZ6c0lEF+JWw6NkrvNlc4o inr7rNW4WSPGOyM78lHgCBoabYuQIvrg1U1S4vCMOG6yQ2Rd4W3QDVw6ITnoDllyiM5K WbZ3XiVHbEQciftkhwwu/C98O8bba0HKY7g2cspwUnWt72GcjCkiscRNRT7B/y25Tzfl XWIr1556/hjKlUroOn/Y4GgWvljp2Hhw1j4R+pGteHMy1gmnGMmn4yvWGcnZa0dCtuqr 6OLw== X-Gm-Message-State: AMke39mfdGipR0VrA3+cOqD1Z+BsDnwl8bbK8I+u38ls5ztgWNtKtHQwXPrckBzLQXGGQw== X-Received: by 10.84.210.15 with SMTP id z15mr13264740plh.11.1489023683282; Wed, 08 Mar 2017 17:41:23 -0800 (PST) Original-Received: from calancha-pc (128.126.156.220.dy.bbexcite.jp. [220.156.126.128]) by smtp.gmail.com with ESMTPSA id 129sm8420313pgj.59.2017.03.08.17.41.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Mar 2017 17:41:22 -0800 (PST) In-Reply-To: <87y3wfv3iy.fsf@yandex.ru> (Arseny Sher's message of "Thu, 09 Mar 2017 00:53:41 +0300") 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:130362 Archived-At: Arseny Sher writes: > How then I am expected to apply > patches generated by VCS, where paths are prefixed with a/ and b/? Ediff will skip those 'a/', 'b/' automatically. > Again, let's consider some simple example: > > mkdir -p proj/src > cd proj > echo "void main() {}" > src/hello.c > git init > git add src/ && git commit -m "commit" > echo "int main() { return 0; }" > src/hello.c > git diff > ../tmp.patch > git reset --hard HEAD > > cat ../tmp.patch > diff --git a/src/hello.c b/src/hello.c > index ab73b3a..76e8197 100644 > --- a/src/hello.c > +++ b/src/hello.c > @@ -1 +1 @@ > -void main() {} > +int main() { return 0; } > > How should I apply tmp.patch to proj? Ediff uses the `default-directory' for the patch buffer as a hint. When i apply patches generated with VCS i _always_ set the `default-directory' of the patch buffer equal as the root directory of the project. That makes multi patches work OK. This is how i would do in your exmple: M-: (dired "/tmp/proj") RET C-x b *p* RET ; Now copy the patch here in your favourite way. C-x 4 r /tmp/tmp.patch RET C-x h M-w C-x o C-y M-x epatch RET y *p* RET /tmp/proj/src RET > Yet am not still sure that this is not a bug; some other guy said that > this behaviour doesn't make sense, and similar bug was fixed recently: > http://lists.gnu.org/archive/html/help-gnu-emacs/2017-03/msg00064.html > http://emacs.1067599.n8.nabble.com/bug-25010-26-0-50-epatch-might-parse-wrongly-a-file-name-td413747.html I tend to agree that it might be possible to improve how Ediff handle these things. That said, as a user i haven't being disturbed so much by this inconvenience. I am also worry if i could break other important feature while trying to improve this; that's essentially why i didn't try hard to work in this issue. If you have some an idea about how to prepare a patch improving Ediff on this area i am welcome to support you in that task. Regards, Tino