Received: (at 26028) by debbugs.gnu.org; 23 Jul 2021 12:54:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 23 08:54:31 2021 Received: from localhost ([127.0.0.1]:42542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1m6uhD-0001rA-Lh for submit <at> debbugs.gnu.org; Fri, 23 Jul 2021 08:54:31 -0400 Received: from quimby.gnus.org ([95.216.78.240]:38506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1m6uhB-0001qy-SP for 26028 <at> debbugs.gnu.org; Fri, 23 Jul 2021 08:54:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jPBG1jJioV0KKYHrS0THUAmswWAe5rQ9Gj5Qu6MXIbM=; b=KZcEufJiGRH6U40ZbnrJ9LjZO2 7VUypMNXsLvzbQDsRtnsCsbnr2JEH6vnF3V5xJOm54V2Ajjkv7GNf9rfe4VIq3lgsh7Qh6UjMP/Ey NOSDw/tD9eWCJWUpnh2DtAQnXD7PKeKW33c/MwpQMzzaLqiNyWsLrbfC0s/ULJrMQNY8=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1m6uh0-0008DG-0P; Fri, 23 Jul 2021 14:54:20 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Filipp Gunbin <fgunbin@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> <87wo07c5gb.fsf@HIDDEN> <87v97qre46.fsf@HIDDEN> <m2h7j6y4v2.fsf@HIDDEN> <87k0nyok79.fsf@HIDDEN> X-Now-Playing: Nazar's _Guerrilla_: "End of Guerrilla" Date: Fri, 23 Jul 2021 14:54:17 +0200 In-Reply-To: <87k0nyok79.fsf@HIDDEN> (Lars Ingebrigtsen's message of "Sun, 16 May 2021 15:57:14 +0200") Message-ID: <8735s5dwcm.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Lars Ingebrigtsen <larsi@HIDDEN> writes: > Filipp Gunbin <fgunbin@HIDDEN> writes: > >> I've looked into ediff some months ago (when writing a function which >> opens new multifile ediff session for comparing vc commits; it's >> unfinish [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN>, Michael Heerdegen <michael_heerdegen@HIDDEN>, Stefan Kangas <stefan@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Lars Ingebrigtsen <larsi@HIDDEN> writes: > Filipp Gunbin <fgunbin@HIDDEN> writes: > >> I've looked into ediff some months ago (when writing a function which >> opens new multifile ediff session for comparing vc commits; it's >> unfinished yet). So I could look at the patch if needed. > > Yes, that would be very helpful. Did you get any further here?
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 26028) by debbugs.gnu.org; 16 May 2021 13:57:27 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 16 09:57:27 2021 Received: from localhost ([127.0.0.1]:51103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1liHGp-0008CR-Af for submit <at> debbugs.gnu.org; Sun, 16 May 2021 09:57:27 -0400 Received: from quimby.gnus.org ([95.216.78.240]:47212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1liHGn-0008CB-8E for 26028 <at> debbugs.gnu.org; Sun, 16 May 2021 09:57:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dn0kYZtwfD4Snj+BbrDG5XDFe5Lhs1LcZHNJWjA9F9U=; b=W5nBm7QsyW7zuQ6qSbno6evgp6 2duDKBR1FfMnszNqaAeXfLEfNF2tygStM3fnqgHW4qXGg3v2704bCbgicJwKN5flS8NR4H3chSUOP tJ9e9DlPQtFSlrI4iruNJ1CYXAD3avXHv3Gl/34+4/+FdVdPVdoG45id0Cw03KWRyz+c=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1liHGc-0007bM-OV; Sun, 16 May 2021 15:57:17 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Filipp Gunbin <fgunbin@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> <87wo07c5gb.fsf@HIDDEN> <87v97qre46.fsf@HIDDEN> <m2h7j6y4v2.fsf@HIDDEN> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAIVBMVEUxLCgiHRlhXFdD Pjr19PDEwbuGgnumo53W1M6AfHb///9QeSwYAAAAAWJLR0QKaND0VgAAAAd0SU1FB+UFEA01Ekv0 2NMAAAGoSURBVDjLjZO9b9swEMVPUlJ5lB0IWkWLjNVNdm1UY6BQpUZ/yBCyuV2ySi0Fc3Qlu1TG Fh3y5zZLhpAskBvvh3ePdw8EeK0xmMuKPDOaULQwAnu5KdemSd9IPWOGYTe0gHFFkAaCnoeW4Jmn gWZUW5UnNeAjcj/pvUgf9dstxBo0AfhNm8pe78OoOo1v8pdnq+CKItHhtWfPlf0I/S676xpdKQDc B2YFxeUuDlXzwzlvT885blQFXMRs02KuAoDM8vv2mmrXcvLH0V25yPU8KFudyvlB29GZgrv7ZUtt w5f6QDK/cCNVkyLM8zRfUnUTHOIhJyzCGwX8PZDzQKpOfH3bT3iYDlxyShNFwUMSiww3WPNAf+JZ N2o+K69ylrKeRlgUvbL4eTt8Sh7Jdq8cyz0ev/iodRtLmbSw7BLX+9UPxdniefgssjJVHADkfpBb MSxPSn/y06/YE85WawUELJ4fWdC4WuRUJAsW7xwti/AWjtNLZkgpQJVtSg/wbh/L0AAkG0R50PvO PR8600e3GWbsNtHBhAVbykyKJw8+mrwhgf+W8z7wD1jTW5FlsOchAAAAJXRFWHRkYXRlOmNyZWF0 ZQAyMDIxLTA1LTE2VDEzOjUzOjE4KzAwOjAwtOn5LwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0w NS0xNlQxMzo1MzoxOCswMDowMMW0QZMAAAAASUVORK5CYII= X-Now-Playing: Rocketnumbernine's _Meyouweyou_: "Slide" Date: Sun, 16 May 2021 15:57:14 +0200 In-Reply-To: <m2h7j6y4v2.fsf@HIDDEN> (Filipp Gunbin's message of "Thu, 13 May 2021 19:29:21 +0300") Message-ID: <87k0nyok79.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Filipp Gunbin <fgunbin@HIDDEN> writes: > I've looked into ediff some months ago (when writing a function which > opens new multifile ediff session for comparing vc commits; it's > unfinished yet). So I could look at the patch if needed. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN>, Michael Heerdegen <michael_heerdegen@HIDDEN>, Stefan Kangas <stefan@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Filipp Gunbin <fgunbin@HIDDEN> writes: > I've looked into ediff some months ago (when writing a function which > opens new multifile ediff session for comparing vc commits; it's > unfinished yet). So I could look at the patch if needed. Yes, that would be very helpful. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Received: (at 26028) by debbugs.gnu.org; 13 May 2021 16:29:34 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 13 12:29:34 2021 Received: from localhost ([127.0.0.1]:44181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lhEDN-0007sn-Vx for submit <at> debbugs.gnu.org; Thu, 13 May 2021 12:29:34 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:33351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <fgunbin@HIDDEN>) id 1lhEDL-0007sZ-OI for 26028 <at> debbugs.gnu.org; Thu, 13 May 2021 12:29:33 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 648015C00C1; Thu, 13 May 2021 12:29:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 13 May 2021 12:29:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=iBCL3/auF8j2XIqo6rAWHs8sBD AgyuvGQHRa5scH3YI=; b=Oac+gXb+RjvRWROgO0cmjZVcLv5KVyqKPe+Y7kR1v7 q4NKzGCGgb7gGcwNjeMDB4ns8vgXAp++Alutr+nkRy0jeucWMGZHCNjHDWpVoeDy IJn+qs838QCEvelChz6a75hOSabEa2/6HcYKo4kreQnRbyFwxspuf7hAq+oRMYUu 0BSJu2Go4Ev5+GtxIwbq0lVay/KAisqtiDOpVl1sHQr4QeDHqSqdY+VUZD+X5RA+ +D1w/IvBPETyGMxk+HETpltSVmEYubHMSLZi44zi1ECcjrePaj/mhtEempsqyxs+ Wc9u09wBklOaZCtjge0WqM3sse0y2j6lp+rfZNKrvnnw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=iBCL3/ auF8j2XIqo6rAWHs8sBDAgyuvGQHRa5scH3YI=; b=MxfB6lHACfVH9AwyDXioxY Pt5KYMFyzeLBd+POHlwTehXtM13yXzHq5rn/8zeaxsCJYk+N/wYsxxcWm2/WlXYX 03CSs8WQAK8wE3ZL1DSE8pm9I4lXMNIW6BOYt+D5DYugVQH65dHIoQWK/pP6eN0i Fi/hdr97Vov+2q1N/N466gTjIxddzjwYcC/mOuvMMW27s9GMP4p5R4JMsVxgLSkh nJ2T/FwxIVh+rCqU6Wvataxalr9sBwulYZnF1+/Xs4BKcvADt1jz7ZfVRgB6svoq 37bBi6BmOsasl/8LbZamp2se0AlBXNxJIG/BBCc3JsRxuLlgSyv2jJNCw4sjzRzQ == X-ME-Sender: <xms:5VOdYCMbz14gd9bmOMNVJ5wpuA_iRV1N-hjwXiHGbp6jnl5gOh5Fjw> <xme:5VOdYA8cyhYjyCLGa7VvuIrtYcgVxkrnfWbdKXc0EzloUn_AOaSAJJq-dy9gC91L9 ebXBe3EbxH3vYvJ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdehgedguddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffujghffgffkfggtgesthdtredttdertdenucfhrhhomhephfhilhhi phhpucfiuhhnsghinhcuoehfghhunhgsihhnsehfrghsthhmrghilhdrfhhmqeenucggtf frrghtthgvrhhnpedvveekffdvueevhfdutdejheekvdeufeevtedttdevuddugfeiffei veeivefhtdenucfkphepkeegrddvtdegrdduleefrddutdeinecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepfhhguhhnsghinhesfhgrshhtmhgr ihhlrdhfmh X-ME-Proxy: <xmx:5VOdYJTEdyA1dVQJwiOjO5q34yLcfQ95jkN28XjNVa0cUoTX_2vBKw> <xmx:5VOdYCsX70Jw2AsI6_BJGxen9DGoBs1S1J76Tpn7ktB7r1yBQydcgw> <xmx:5VOdYKdDhTC2NfDxknEA8tb5-Kte53PkNLegMaJeHOxhrvkqaq9yOg> <xmx:5lOdYJ5PB7_DKPZQ8jDxrGk83kxYAp_DcRIvLMghrs16RQYaqmc2ig> Received: from fgunbin.local (unknown [84.204.193.106]) by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 May 2021 12:29:24 -0400 (EDT) From: Filipp Gunbin <fgunbin@HIDDEN> To: Lars Ingebrigtsen <larsi@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches In-Reply-To: <87v97qre46.fsf@HIDDEN> (Lars Ingebrigtsen's message of "Mon, 10 May 2021 14:02:17 +0200") References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> <87wo07c5gb.fsf@HIDDEN> <87v97qre46.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (darwin) Date: Thu, 13 May 2021 19:29:21 +0300 Message-ID: <m2h7j6y4v2.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN>, Michael Heerdegen <michael_heerdegen@HIDDEN>, Stefan Kangas <stefan@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) On 10/05/2021 14:02 +0200, Lars Ingebrigtsen wrote: > Michael Heerdegen <michael_heerdegen@HIDDEN> writes: > >> AFAIR it solved my problem, but I can't judge whether it's ok to >> install since I don't know the code. > > The patch no longer applies cleanly -- do you have an up-to-date version > of Tino's patch in your tree, by any chance? Or did you just try it > then, and then back it out again? > > Looking at the commit history for ediff, it doesn't really look like we > have any ediff domain experts to evaluate the patch, which makes it hard > to decide whether to try to apply the patch or not. I've looked into ediff some months ago (when writing a function which opens new multifile ediff session for comparing vc commits; it's unfinished yet). So I could look at the patch if needed. Filipp
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Received: (at 26028) by debbugs.gnu.org; 12 May 2021 09:28:06 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 12 05:28:06 2021 Received: from localhost ([127.0.0.1]:38179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lgl9y-0002nz-70 for submit <at> debbugs.gnu.org; Wed, 12 May 2021 05:28:06 -0400 Received: from mout.web.de ([212.227.15.4]:57013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <michael_heerdegen@HIDDEN>) id 1lgl9v-0002nS-Rz for 26028 <at> debbugs.gnu.org; Wed, 12 May 2021 05:28:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1620811677; bh=pazeYbmCtpTBnR4RZJxtTf/pnrsKCTFRuBmbUZmtstM=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=rW62lpHR4cTZwBLM3XcZYBXGF1+PU1e4QGdCv4W2jnZYGqEdcG9ItiNQmNFvBH9aT 1aD26nim8oA+zwh1kVR1mmP0REUCHmLt/NL0ww//uqlHeL7Gu26cG8bbCXloGvBoxq IGRd1yFX1obCaEfxA3sHKnFj8BRoOpjRk9Eu4Ado= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from drachen.dragon ([94.218.212.89]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MEUSE-1liPqx14sU-00GUKL; Wed, 12 May 2021 11:27:57 +0200 From: Michael Heerdegen <michael_heerdegen@HIDDEN> To: Lars Ingebrigtsen <larsi@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> <87wo07c5gb.fsf@HIDDEN> <87v97qre46.fsf@HIDDEN> Date: Wed, 12 May 2021 11:27:56 +0200 In-Reply-To: <87v97qre46.fsf@HIDDEN> (Lars Ingebrigtsen's message of "Mon, 10 May 2021 14:02:17 +0200") Message-ID: <875yzol2sj.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:LeopFE1U/CXRyPJfwQat5g3BNA6/ojoKUXdIjYrWjf7VZw7wfby t+ruaVNukTo66ZX8ogrgHx8eOnaoIZxlbloReu/FRyA9R9LhELymR8la3YWDkdQy6mpG+M5 peIgulxEi0GTf7OoOCtELw+ZPlDHhqcUWmDPESl4+cTcgCavzDodIKd8N/AkRTt+5XH0U5a Yd49JguOxxx55dwcFc/EA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:kbXlXqnN+uw=:MqowCN5EcNLhcP89/cZcgt RPQtts9SY+jkhHvYAaX54SSzJNTqDHBkb3fejlzzauYw2fkPshFVG4wvYomLnefuO3EEYI5OA NK6XjXRF78XtysvdJ7p0hgAeZqJeB9esqZTQEsL4VjOJ2iWxQ8VzRxSrTGQbYPoBClnvjylXC EU5Fj9iNhYCbIj2Pr5LP4IwBSiQUgw6NPuSeWBjGGGLcURZxv6whN5Z9BYgtpIoajI//4xQV7 1xgkuLPNWbAs8Cn7KlyoiXUKVCO8Z/GTB+d7TYkjG2yUOxqpb88nq8d/VMm/ii3VXtGhIZvq0 vIrRC8oUxgkGYa1P3/0KnlM6N3SV82KGV2hO1M77+jNbAQz9iZI3XjRml2+vF88LQycjRATZM DswfkBvYLxPV+5cHYHq4jleObujfZzkRngqNpcUHNs+1KaRmS41LrikJoLrRwLuh14fNkoACj 2WTo/HGbETB1InrUiRjZJdLniVZ9mPuTeDPiiTJeD2F0sPnCe7pm8feU/3Z8+e4o8CnXN1hOJ dDFWdf+KeT5ltx/U5RNSRMzSZ+WTyV7d+VWUVnOZl6BPAqr5foDSJoncI1L+FK4S5WW4hXhxQ MFg8X5KsjsPzkbjTjHeCJMO1Cka/0vxKtPZSwHfQQWrDWXxP9y4Tv0lgS+3QqfiV5S9AL3xx2 iirYpaBGYEgjAgb+SQIFW8OeLN07Ra0GVUdtnRDwqJ2UJLBpDmiYZ/gqesJQY5TEsN+Gy79t7 BJGo/jeumT3N6FR/UCjEwchV6iuqMAmbm+ZtWlXqkCECCIN5VTFT2q/IyHxIG54ZJpSAPTPhp qoTGX/A4qW43pI0gza0/HpnRJ0Zf72uwRjPqKfoDnDbQly6Si6xOS9wMR4HVQwwxvJ5z1GAYS 8hJpu5OGQmV3B/jJaUfwCEmlv1NdNk1NG0nOwrPoInm9CltmwMcpWok/aCR1ImFsAl8/rpjHY aAgC3h9QHV15kRKv/l5GC2R/29FDrlVbGOMlcNg7RGw3HztqE/hR1BHfXb55do0fCwV0u6G8p mt8/l2ugf+1JXE5FzUTo81YbmsIFf/lucXZ3ONNo9EzkWVI9JiRNkFvEsZO3MLzNyuEB7pzdl mSQ8qdhGbNjni0rlL/gbeTp/pc//9prtk8cpkpqYx6lrWB/r/a6NDEm9BpfG9lNB7Z4N595kC q8BjJcJ1QIguyxsgto4q0GJkXlbhu0IqCe7/ORZ1+bZNcWAqyWnTHrhPeWf2LeZV/KIumW6qu Ivj0KBtHntkQc6nkL X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Kaushal Modi <kaushal.modi@HIDDEN>, Stefan Kangas <stefan@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Lars Ingebrigtsen <larsi@HIDDEN> writes: > > AFAIR it solved my problem, but I can't judge whether it's ok to > > install since I don't know the code. > > The patch no longer applies cleanly -- do you have an up-to-date version > of Tino's patch in your tree, by any chance? Or did you just try it > then, and then back it out again? I'm very sorry Lars, but I don't have anything better than Tino's original patch. I removed the patch from my tree when the collisions started to occur. Regards, Michael.
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Lars Ingebrigtsen <larsi@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 26028) by debbugs.gnu.org; 10 May 2021 12:02:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 10 08:02:30 2021 Received: from localhost ([127.0.0.1]:57595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1lg4cH-00057R-VM for submit <at> debbugs.gnu.org; Mon, 10 May 2021 08:02:30 -0400 Received: from quimby.gnus.org ([95.216.78.240]:34524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <larsi@HIDDEN>) id 1lg4cG-00052Z-4j for 26028 <at> debbugs.gnu.org; Mon, 10 May 2021 08:02:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jREFI+dtHBDSH01yTgzomN+I/YdJamubCmrYd2vcZrY=; b=N9WyYl8aF+dHZdn3JaazS+iPMS 2p6vvlcC4buudV3d6YhpgoCIWdowO57EsteFiDjNTZFFehR4yqVF+LsOE+eR3h9Z5cs0rUz3/a8a6 P+i9jQ20SB1vpQMBup5WwJMKvzzt/C5ErAuXVu2CcoMFBNep1Tnps/726onUT2OAwbR4=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <larsi@HIDDEN>) id 1lg4c6-0007vg-1x; Mon, 10 May 2021 14:02:20 +0200 From: Lars Ingebrigtsen <larsi@HIDDEN> To: Michael Heerdegen <michael_heerdegen@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> <87wo07c5gb.fsf@HIDDEN> X-Now-Playing: Alva Noto and Ryuichi Sakamoto's _Two_: "Inosc" Date: Mon, 10 May 2021 14:02:17 +0200 In-Reply-To: <87wo07c5gb.fsf@HIDDEN> (Michael Heerdegen's message of "Sun, 04 Oct 2020 00:25:40 +0200") Message-ID: <87v97qre46.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Michael Heerdegen <michael_heerdegen@HIDDEN> writes: > AFAIR it solved my problem, but I can't judge whether it's ok to > install since I don't know the code. The patch no longer applies cleanly -- do you have an up-to-date version of Tino's patch in your tree, by any chance? Or did you just try it then, and then back it out again? Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Tino Calancha <tino.calancha@HIDDEN>, Stefan Kangas <stefan@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Michael Heerdegen <michael_heerdegen@HIDDEN> writes: > AFAIR it solved my problem, but I can't judge whether it's ok to > install since I don't know the code. The patch no longer applies cleanly -- do you have an up-to-date version of Tino's patch in your tree, by any chance? Or did you just try it then, and then back it out again? Looking at the commit history for ediff, it doesn't really look like we have any ediff domain experts to evaluate the patch, which makes it hard to decide whether to try to apply the patch or not. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Received: (at 26028) by debbugs.gnu.org; 3 Oct 2020 22:25:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Oct 03 18:25:51 2020 Received: from localhost ([127.0.0.1]:44574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1kOpyR-0006p6-4L for submit <at> debbugs.gnu.org; Sat, 03 Oct 2020 18:25:51 -0400 Received: from mout.web.de ([212.227.17.11]:43915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <michael_heerdegen@HIDDEN>) id 1kOpyP-0006os-Sx for 26028 <at> debbugs.gnu.org; Sat, 03 Oct 2020 18:25:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601763942; bh=QYNtgykOmBzs1gKCZSZPVs1jwosRNvONA/BqPifawkE=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=gSPGE0hmFmSdOxcDNs3y493zI+rLkp4XitsOZXXA6MePaDxcWk4JBAB9VJN1pk49L Tau06lfv8qZlXgaUr9D/B4PMYydz4VS3AsaGP+Cxy8/q+iM4ODAd0JfrKsaTuK05Cz zWTeTil3rlLxssRJWBhd3s+ODRikpwLDJ8hTiaHs= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from drachen.dragon ([94.218.220.78]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LzbLS-1kTWkO1jPu-014mV4; Sun, 04 Oct 2020 00:25:42 +0200 From: Michael Heerdegen <michael_heerdegen@HIDDEN> To: Stefan Kangas <stefan@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> Date: Sun, 04 Oct 2020 00:25:40 +0200 In-Reply-To: <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> (Stefan Kangas's message of "Tue, 11 Aug 2020 00:34:55 -0700") Message-ID: <87wo07c5gb.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:tGT4B7PHeHjLlVuBxyyeSFKrsjpfowqPd2kPLl8bUrHJiWazZus rYZXZCfIdJQZvYmki0tg23Ui+wlJ8i9Pxtw8kUYeHhFs1w2u4WooDHCl0WV0oi7XmJTGmYs G1COgnjxKbWAgWjPx3yXavKYLny9nzNE3YqP2oelurGv9mGiqZkZGDm+e2KtUuQ8yADh0gi u+hccBfcMAj8DqPUhMlBA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:oaMRLd0mBcg=:tAQN/zcaAGgJFm5f7TJFiD YB9FxJTjMCR53BXB9ZZru7QiM9jVUBTTmH+sj2T1sjBax081EbnvFA6czE5uyRQ3YIw/lXp5Z 68euq4yE6gFJ/YU8tsgDArsgPTfo0lO/BYf/Y7Fic4krF8r+QQcZcHo7rdnjkeD+ecXOGF9CV kQFW4dh7wwJD/iGtusqdJEgI1Q4YYHEfkr0oURYG0Q05hzSphRQnxqwxe0HbVJCdlO4ilSUC+ FPsRNqu8fdCdorgjpw/BerNnFixHMu/L/iE5GHRfnr5JehhLyWpZMNiGjJKfcnY5cIIBdNhxt ea2P3MAuYi+s0AIr1LzELFKVu5SpU+Ev/yoCWro91wzNp6T39oLWBJTpSmuoLH4erg7cpEP0l 4nicCasSC1i6JyL9ASE0Z2kph54JD6c/Yb12sEwO4SmQBJwCmWH56JWitaUIsvCvpD9PHcl1U XBBvBKntjxgZmcvm4zfh1V0SaTrTQXlzaV7NPZfr0ucoivWgoXWxZSIq2qPZvCBDp7gm2cx1x GLYWwfhpuEGyykLVz/noey02JEmGNYoyg7eWW+4LLpSCykwLMkzBlvAWkd1RkXDgHaxigtTAA jPT76ww1g+98JdWk5zfWLEY9c7VWQ2E3CqMXhk968QtfRxXMthyXqY0jL/WpM8VBFo7aJiXmr va7yWutfWs1F77TuTdaiQCWkL6/LonaqVHTbVNrDJqCEl/FkirWd+AIHNAyP1eI5BAqiUkL5b Osff5C/tx8W8nz57+SY508dgaNg1OmXqGTbABS27aFeINiV7AplbIC+g7fwuzhjnKvOnBeEWY lyajjPl30mp0toQUTJDp82YgbYxc7PSc4Uukwij+/9IHneGzcuzHjnhF02Ro6tI4OPUf+foty oQnX/nL2aPaSsfGv3eMbHWvzNA8BKrgwxmC8NV3xMcSXlQEBuNXN6xIxkn0eyWwV3rhbtQoD0 JIm2hRPOxa4ClXbi9v8frt8UHUg/4osab1uUnmna/BpSOgw1ahd9VGQLVMxulvz/hBTVohmZh O25Njp8IdnT82O2pRCjBcyZnLPw72pTfRG+xIZ35vrCVcRXOEEMV1u/Oirw/TtcrHUweDhkW+ a5LkWar5M5Yg5vZmh0uJp1mYOabrah4Yo7gzFu0BMpt3hqRlZHyP4g0pTXz2rXSE8tbVDoMzs xk12Q8vih3xsDRAEckDDSsQ+ok5zT7PQiiXRu3I8RV2sNEQFdpC+lZj3zNgZ82HrZzKonbZyn +1GSdgMTXqIb1jdYSEg2KoahCCsWUQmpRMbX5YQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Kaushal Modi <kaushal.modi@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Stefan Kangas <stefan@HIDDEN> writes: > It looks like this patch was never installed. Should it be? AFAIR it solved my problem, but I can't judge whether it's ok to install since I don't know the code. Michael.
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Received: (at 26028) by debbugs.gnu.org; 11 Aug 2020 07:35:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 11 03:35:03 2020 Received: from localhost ([127.0.0.1]:38426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1k5OoJ-00029K-6s for submit <at> debbugs.gnu.org; Tue, 11 Aug 2020 03:35:03 -0400 Received: from mail-yb1-f195.google.com ([209.85.219.195]:46443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1k5OoH-00028m-G9 for 26028 <at> debbugs.gnu.org; Tue, 11 Aug 2020 03:35:01 -0400 Received: by mail-yb1-f195.google.com with SMTP id x10so6534736ybj.13 for <26028 <at> debbugs.gnu.org>; Tue, 11 Aug 2020 00:35:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:user-agent :mime-version:date:message-id:subject:to:cc; bh=awt2Ln7fNjvfqIrFPAseVg5iFrBhO9yyIRGPweRDq1Q=; b=SUYO5JE5lH7rQ2k6ASmjrldoV2VHy8Zr/sNkbl5cS0lwY0G128ywM9rzkApLMEUByl LlEWBClnfxOS9QNhcw1dQfM17SW51r+JvFN3KDz7cw8kziqPTsMoIgEMvNpT09BYi+cj zivmzfCi1VQ3WmWVhz5yIqRiSVCi2U2YbFxytyfnT+dhBqxuX4gavxDMat3H27zqjv69 LeogGWGR6Pinek6mN6yXzpn1ivDwY1W4atn3tLYic4UmJi89KFG9IeoEsj4aM3DQyGi1 EaHKLgu/bB3RCmHwL3BT9k+QCtUEq/BL06vDFR5AEhPCv7Pe3WUQyjoN8PPshFqQ8Nz2 lwDw== X-Gm-Message-State: AOAM532CYWzNaQCdo+qdUeeYQ0uWQQjdV+OLgXN0lr79ZRSkVQJR1gkG f6ZF4fk9sPlhKvztNPcWssKwLEgdG/gCdXddJSQ= X-Google-Smtp-Source: ABdhPJzIqA9ja6Z4O5eq+fN2BzMgy5PoSbhJc43eVjAUa8liCDTUDKt+IbGLZD5IjxiydI2MfRcdysRPRbgMFow7b6Q= X-Received: by 2002:a5b:508:: with SMTP id o8mr22129544ybp.43.1597131295978; Tue, 11 Aug 2020 00:34:55 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 11 Aug 2020 00:34:55 -0700 From: Stefan Kangas <stefan@HIDDEN> In-Reply-To: <alpine.DEB.2.20.1705240920300.30390@calancha-pc> (Tino Calancha's message of "Wed, 24 May 2017 09:46:59 +0900 (JST)") References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> <alpine.DEB.2.20.1705240920300.30390@calancha-pc> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Date: Tue, 11 Aug 2020 00:34:55 -0700 Message-ID: <CADwFkm=z=UdL+TJ9GVJdBAxS-BgsbHrxPb=gq4Hi7TbkuRc_5A@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches To: Tino Calancha <tino.calancha@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26028 Cc: Michael Heerdegen <michael_heerdegen@HIDDEN>, 26028 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Tino Calancha <tino.calancha@HIDDEN> writes: > On Wed, 24 May 2017, Michael Heerdegen wrote: > >> Tino Calancha <tino.calancha@HIDDEN> writes: >> >>> Recently i am not using `epatch', but maybe following patch >>> is of interest for someone: >> >> FWIW, do you think you understood all of the code you changed (I ask >> because I gave up after a while)? > I think so. I you exclude from the patch the added tests in > test/lisp/vc/ediff-ptch-tests.el > then this patch just touch: > 2 files changed, 42 insertions(+), 18 deletions(-) > The only it does: > * tweak the original heuristic part for guessing the file names > * change the suggested defaults in the prompts asking for the patch and > dirs to patch. > >> If you did, do you think we should >> install your fix, or are there open questions? > I have tested with plain diffs and with Git diffs. I didn't test it > with other VC than Git. > I don't think solves all the problems, but at least it makes `epatch' usable for > the most common multipatch situations. That was 3 years ago. It looks like this patch was never installed. Should it be? Best regards, Stefan Kangas
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Stefan Kangas <stefan@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 26028) by debbugs.gnu.org; 24 May 2017 00:47:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 23 20:47:13 2017 Received: from localhost ([127.0.0.1]:35268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1dDKSE-0004ST-RI for submit <at> debbugs.gnu.org; Tue, 23 May 2017 20:47:11 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <tino.calancha@HIDDEN>) id 1dDKSD-0004SE-05 for 26028 <at> debbugs.gnu.org; Tue, 23 May 2017 20:47:09 -0400 Received: by mail-pf0-f194.google.com with SMTP id u26so30842836pfd.2 for <26028 <at> debbugs.gnu.org>; Tue, 23 May 2017 17:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=ZAqbG0B5nFeEBSidHU7TqG0jRwFTAnOdJF+Jg5Sp8v4=; b=q9geL97eKOD0AFwEHErnj2zZ3LHlQErnfq3FP1fTi/17CeTsg9jhNjoDqTkvlQYHjP xBYqMZ0g15R9LmJjR9TBr2LVT5QEVUdwdE2JmTmh2QSWEyU/t4xV1UfzifSTw4oW5eMQ g8ZolGkItBr/zI3Qoa24lM4ry3U5BmrennaTOCY+t2QS/KytJf5bP6zba/1X8MbA+zFg F7/hM9iJqP31F9/3JASSN5IUvzyZBmo7kiElSgkAHATF3anzdGGrFnSY+xwVWMTWBHqP EXS1IRHu0giCCVf1/eUZ9Z/k0JT9JyW7C2M6+TNGfo/eOPMQhSXuAvu6rVB8v2VWNxU7 bHKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=ZAqbG0B5nFeEBSidHU7TqG0jRwFTAnOdJF+Jg5Sp8v4=; b=OnPQ11KjrBakwc6iAyRnB/1UVGv2ZDaP7MG39gI6LgnRoBc1Ssm/Az8I8E2WIRZ7Nd Ei0VkgXxbE0Wh5jrryP6CNH67h6UpOpdJSSJ24VZJwkVDyyU42xA5ND+mUZEeIslHzl4 TuM0wNrCTnipucRL14pEWG0w3cyRWy7gFRBRTxJiXSzz9ZSXioQs0xjO6oi0dJykmA0s AB1TjKbYBp7KTjGiQLRrp9xKhnhkJwn3zTNCRYbguTISo07l1TNBVVDZ+OulSqXRpC+L RTaH91CBL/MGZSMc1aVzdcDRzqdnt8SWXt54pn9S/DbGdD6EsedbC4oprVZftjxJVH8x Xn/Q== X-Gm-Message-State: AODbwcC3qErR1+ceLvxz6KJMnm3juG4rKuz2iUN/A99DpyD4D7MFXKB+ GqZ3UKyBies3Gw== X-Received: by 10.98.102.208 with SMTP id s77mr34536398pfj.22.1495586823082; Tue, 23 May 2017 17:47:03 -0700 (PDT) Received: from calancha-pc (222.139.137.133.dy.bbexcite.jp. [133.137.139.222]) by smtp.gmail.com with ESMTPSA id t66sm3578243pfe.134.2017.05.23.17.47.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 17:47:02 -0700 (PDT) From: Tino Calancha <tino.calancha@HIDDEN> X-Google-Original-From: Tino Calancha <calancha@HIDDEN> Date: Wed, 24 May 2017 09:46:59 +0900 (JST) X-X-Sender: calancha@calancha-pc To: Michael Heerdegen <michael_heerdegen@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches In-Reply-To: <87efvfkx9l.fsf@drachen> Message-ID: <alpine.DEB.2.20.1705240920300.30390@calancha-pc> References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Tino Calancha <tino.calancha@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) On Wed, 24 May 2017, Michael Heerdegen wrote: > Tino Calancha <tino.calancha@HIDDEN> writes: > >> Recently i am not using `epatch', but maybe following patch >> is of interest for someone: > > FWIW, do you think you understood all of the code you changed (I ask > because I gave up after a while)? I think so. I you exclude from the patch the added tests in test/lisp/vc/ediff-ptch-tests.el then this patch just touch: 2 files changed, 42 insertions(+), 18 deletions(-) The only it does: * tweak the original heuristic part for guessing the file names * change the suggested defaults in the prompts asking for the patch and dirs to patch. > If you did, do you think we should > install your fix, or are there open questions? I have tested with plain diffs and with Git diffs. I didn't test it with other VC than Git. I don't think solves all the problems, but at least it makes `epatch' usable for the most common multipatch situations. I) You know, `epatch' has never parsed multipatches with files in different dirs, as: foo/file1 bar/file2 II) The only multipatches `epatch' worked before is when all the files belong to the same dir, as: foo/file1 foo/file2 This patch makes possible to handle I) as well.
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.Received: (at 26028) by debbugs.gnu.org; 23 May 2017 22:45:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 23 18:45:53 2017 Received: from localhost ([127.0.0.1]:35212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1dDIYr-0006V6-8m for submit <at> debbugs.gnu.org; Tue, 23 May 2017 18:45:53 -0400 Received: from mout.web.de ([212.227.15.14]:62332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <michael_heerdegen@HIDDEN>) id 1dDIYo-0006Ur-Sf for 26028 <at> debbugs.gnu.org; Tue, 23 May 2017 18:45:51 -0400 Received: from drachen.dragon ([94.216.140.150]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MDxFv-1dAlSa12Y3-00HRai; Wed, 24 May 2017 00:45:43 +0200 From: Michael Heerdegen <michael_heerdegen@HIDDEN> To: Tino Calancha <tino.calancha@HIDDEN> Subject: Re: bug#26028: 26.0.50; epatch for multifile patches References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN> <87y3wfv3iy.fsf@HIDDEN> <871srfbyps.fsf@calancha-pc> Date: Wed, 24 May 2017 00:45:42 +0200 In-Reply-To: <871srfbyps.fsf@calancha-pc> (Tino Calancha's message of "Tue, 23 May 2017 20:26:55 +0900") Message-ID: <87efvfkx9l.fsf@drachen> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K0:nGtuaRgTzsPgWKoH41btg9qEGPaPQ2ZiNmsAk/xSLSF8VgSj8YF sJFlRZak0uRqOv3ERA3hsugVSGEvClVxCfHSdxOGQubiSfHysxhFS4KiQhOK5zgD4mhz91v I20c8x/UlcNh1wzsnvaa0cIqjENlV1ycX1y17wclCgcfJY+w3H3X2D7oiiPyTNUCI1qp/Iu 47hV9Sfygppwyvg+CiFxQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:2risK2LdM6A=:zc1XptTd8HoNKvQeFdNVNl //5UoXXqLAG5c4zvZM8hPTrM/4Obm28zU8+9wx9PRVG0M4ILbKnfg5+dX85B7EEBBgn9kBxFi 6JXvdPVtjEjDkfV98evay7Ac9aCs19oEGZWXSsMxK5UafHSlevyjiV6JHL+RTAaycH/Fmc6q2 qS02rBYevDUoVLBRdcKTPKe9+yEfBIH4FtNzerkvU0mwuWCKzVV+g9A9LmzocSkcUFYFXRWKl j5Sj2rLKQCXTNQcMpycngfJ4WQCbc8SZcJSVX3ILq7yQwYB/h3bliakwLBFCEHP36LnGxkqpq ANoOD4zm552ZxcKWHUnlZZinK7sESPdfWZg+zLYrSkG3coufkNBQdggeEvlauHhFYZNE9t96E EKxxz3NnwxYOe+4JbJRY5p+nPADpBjkkPItu0n+wids9MsxF+Osp7xEzDaGnp2ypZm57bQdzD o9ui9afn6ueZWsvWd7bRKn4oP5jaii6hKcJ/YDqhV5/P/ikf/c5d3Y8O9M2WfGcGa9qzlgxvR lPEJ27tT53sNm3CrTyTRDkhx9ferZRyxv50mNdYgG2prmernatoT8ENTeDSVxYmM2go6xO0zG 3/Byxn0TKD19zi3MsEOA5xCHU248pWDOAEilJyqmQ1MGCUutj0dlKHSYSGQTRys9VkZ7stYQa tmoW+iwrVGLr4gtrJDJcvk4jVzTXF+kax20GMlWTaLSzZz6TJ1cbCk5Nqt+2XSEOSlqs1LlHb e6BT5OiaUN5QU3TAMNxWvZ26HVVQQEICx7LmenMtnLF9TicSptOZn7aT/cMZ8/L5X6ITjLdFG q5a0k6R X-Spam-Score: -3.5 (---) X-Debbugs-Envelope-To: 26028 Cc: 26028 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, Arseny Sher <sher-ars@HIDDEN>, Kaushal Modi <kaushal.modi@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.5 (---) Tino Calancha <tino.calancha@HIDDEN> writes: > Recently i am not using `epatch', but maybe following patch > is of interest for someone: FWIW, do you think you understood all of the code you changed (I ask because I gave up after a while)? If you did, do you think we should install your fix, or are there open questions? Thanks, Michael.
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at 26028) by debbugs.gnu.org; 23 May 2017 11:27:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 23 07:27:11 2017
Received: from localhost ([127.0.0.1]:34087 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1dD7y3-0005aC-7U
for submit <at> debbugs.gnu.org; Tue, 23 May 2017 07:27:11 -0400
Received: from mail-pf0-f169.google.com ([209.85.192.169]:36754)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <tino.calancha@HIDDEN>) id 1dD7y0-0005Zy-7S
for 26028 <at> debbugs.gnu.org; Tue, 23 May 2017 07:27:08 -0400
Received: by mail-pf0-f169.google.com with SMTP id m17so111919498pfg.3
for <26028 <at> debbugs.gnu.org>; Tue, 23 May 2017 04:27:08 -0700 (PDT)
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=ScNIvGqZAe73x1VDW3/3+DRbAPlWJ/z4vX19PSsApUA=;
b=io3RIcrBExi+FFGCwLz4JzWQAykEgJntBDO/g97y3V39NYcEmERCixYsRQig0SYP4c
2jDA8VMkSLWPbXefMO6KLHDnXPzI4iLJEK4P/ky13lfnBkC7CFoce/U2hxcT0fL7f1yD
ynJTelkVhql64JszhaVagmTW0xqoYVtV0zo0TqDgRGAD/QabZF8ZSxfDRUeqvBDTk4KW
qbPA5c9OzlmemSOnyURRHMFZka8dw936L6V8FWAvbWwKrWCQer9VmWIsFT6wBCzc//u/
kREnBT8Tx5lYJ19wmrp+Jy2+s3BDOR93XablmzNQ9DZsLzSLmzunfdnOLTYVAcl3SeUi
fYIQ==
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=ScNIvGqZAe73x1VDW3/3+DRbAPlWJ/z4vX19PSsApUA=;
b=g+bBX9SSpZjxYzeQhKEw70YNn2w57sWPumUxHX6VMSCwByRnBkoQ073gssNtXmJmfn
zeutM/0Maa4Lr0fIwJHbjVLVSc0u4L6HQh2ffuuujcRot5w0Lh1AVMgDPfzQ9zYjXZmN
PdXO1WUxfz7Pri75evTC0TnXv/wnTW5rf8RWB3cSaV2iDlDRu+LoHzwCH6bTg9t2Ii8Y
noSNbaH8SLKMuHUfcpKZxXIfqBvU0nuxdfgAzEWUxwDgEpL/fnamy9PeNeN1vSx7LXIi
GkZj3TO/PPgoDGH2yNH2PKQ7f1XGXJ9PInuelKDZkYTkRmMZ4owkS2awIwZd9vkH9/LG
66QA==
X-Gm-Message-State: AODbwcAv926jdt+098npviRzq4yFv75w/pSJWEtS7GRcxvt7Kwzcgxam
OSOybUZFFaWAdw==
X-Received: by 10.99.121.13 with SMTP id u13mr31596397pgc.147.1495538822076;
Tue, 23 May 2017 04:27:02 -0700 (PDT)
Received: from calancha-pc (222.139.137.133.dy.bbexcite.jp. [133.137.139.222])
by smtp.gmail.com with ESMTPSA id
x12sm1286919pgc.47.2017.05.23.04.26.59
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Tue, 23 May 2017 04:27:01 -0700 (PDT)
From: Tino Calancha <tino.calancha@HIDDEN>
To: Arseny Sher <sher-ars@HIDDEN>
Subject: Re: bug#26028: 26.0.50; epatch for multifile patches
References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN>
<87y3wfv3iy.fsf@HIDDEN>
Date: Tue, 23 May 2017 20:26:55 +0900
In-Reply-To: <87y3wfv3iy.fsf@HIDDEN> (Arseny Sher's message of "Thu, 09 Mar
2017 00:53:41 +0300")
Message-ID: <871srfbyps.fsf@calancha-pc>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.8 (--)
X-Debbugs-Envelope-To: 26028
Cc: Michael Heerdegen <michael_heerdegen@HIDDEN>, 26028 <at> debbugs.gnu.org,
Eli Zaretskii <eliz@HIDDEN>, tino.calancha@HIDDEN,
Kaushal Modi <kaushal.modi@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.8 (--)
Arseny Sher <sher-ars@HIDDEN> writes:
> Eli Zaretskii <eliz@HIDDEN> writes:
>
>> 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.
>
> Okay, it might be not very convenient (as you might have several
> versions of project inside ~/tmp, and ediff will ask you which one is to
> be patched), but it works. However, how then I am expected to apply
> patches generated by VCS, where paths are prefixed with a/ and b/?
> 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?
Recently i am not using `epatch', but maybe following patch
is of interest for someone:
--8<-----------------------------cut here---------------start------------->8---
commit 3f4561b160f2cc9e2b47d16e7f27fbb9b86c3f40
Author: Tino Calancha <tino.calancha@HIDDEN>
Date: Tue May 23 19:21:42 2017 +0900
epatch: multi-patch enhancement
Handle multi-patches with files belonging to different
subdirectories.
(ediff-fixup-patch-map): For a multi-patch, set base-dir1 to a/
and base-dir2 to b/ if it is a Git patch; otherwise, set both to .
(ediff-map-patch-buffer): Use buffer-substring-no-properties.
* lisp/vc/ediff.el (ediff-patch-file): Show differente prompt
for multi-patches. For single patches, use the patch header to guess the
file to patch, and ensure the input matches an existing file.
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug26028): Add test.
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 0340672da2..0d53b2aff4 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -222,10 +222,10 @@ ediff-map-patch-buffer
;; (filename-from-1st-header-line . filename-from-2nd-line)
(setq possible-file-names
(cons (if (and beg1 end1)
- (buffer-substring beg1 end1)
+ (buffer-substring-no-properties beg1 end1)
"/dev/null")
(if (and beg2 end2)
- (buffer-substring beg2 end2)
+ (buffer-substring-no-properties beg2 end2)
"/dev/null")))
;; Remove file junk (Bug#26084).
(while (re-search-backward
@@ -290,18 +290,25 @@ ediff-fixup-patch-map
(or (file-name-directory (cdr proposed-file-names))
""))
)
- ;; If both base-dir1 and base-dir2 are relative and exist,
- ;; assume that
- ;; these dirs lead to the actual files starting at the present
- ;; directory. So, we don't strip these relative dirs from the
- ;; file names. This is a heuristic intended to improve guessing
(let ((default-directory (file-name-directory filename)))
- (unless (or (file-name-absolute-p base-dir1)
- (file-name-absolute-p base-dir2)
- (not (file-exists-p base-dir1))
- (not (file-exists-p base-dir2)))
- (setq base-dir1 ""
- base-dir2 "")))
+ (cond (multi-patch-p
+ ;; Git diffs appends 'a/' '/b' to the files.
+ (if (and (string-match-p "\\`a/" base-dir1)
+ (string-match-p "\\`b/" base-dir2))
+ (setq base-dir1 "a/" base-dir2 "b/")
+ (setq base-dir1 "" base-dir2 "")))
+ (t
+ ;; If both base-dir1 and base-dir2 are relative and exist,
+ ;; assume that
+ ;; these dirs lead to the actual files starting at the present
+ ;; directory. So, we don't strip these relative dirs from the
+ ;; file names. This is a heuristic intended to improve guessing
+ (unless (or (file-name-absolute-p base-dir1)
+ (file-name-absolute-p base-dir2)
+ (not (file-exists-p base-dir1))
+ (not (file-exists-p base-dir2)))
+ (setq base-dir1 ""
+ base-dir2 "")))))
(or (string= (car proposed-file-names) "/dev/null")
(setcar proposed-file-names
(ediff-file-name-sans-prefix
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 4751bb6ddc..e41839e968 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -121,6 +121,7 @@ ediff-date
(require 'ediff-init)
(require 'ediff-mult) ; required because of the registry stuff
+(require 'diff-mode) ; diff-hunk-file-names
(defgroup ediff nil
"Comprehensive visual interface to `diff' and `patch'."
@@ -1355,6 +1356,7 @@ ediff-patch-default-directory
(declare-function ediff-dispatch-file-patching-job "ediff-ptch"
(patch-buf filename &optional startup-hooks))
+(defvar ediff-patch-map)
;;;###autoload
(defun ediff-patch-file (&optional arg patch-buf)
"Query for a file name, and then run Ediff by patching that file.
@@ -1376,11 +1378,26 @@ ediff-patch-file
(expand-file-name
(buffer-file-name patch-buf))))
(t default-directory)))
- (setq source-file
- (read-file-name
- "File to patch (directory, if multifile patch): "
- ;; use an explicit initial file
- source-dir nil nil (ediff-get-default-file-name)))
+ (let ((multi-patch-p (with-current-buffer patch-buf (cdr ediff-patch-map))))
+ (cond ((not multi-patch-p)
+ (let* ((files (with-current-buffer patch-buf
+ (diff-hunk-file-names 'old-first)))
+ (def (if (and (string-match "\\`a/" (car files))
+ (string-match "\\`b/" (cadr files)))
+ (expand-file-name
+ (substring-no-properties (car files) 2)
+ default-directory)
+ (car files))))
+ (setq source-file
+ (read-file-name
+ "Single file to patch: "
+ ;; use an explicit initial file
+ source-dir nil 'mustmatch def))))
+ (t ; multi-patch
+ (setq source-file
+ (read-file-name
+ "Directory to patch, use root project dir: "
+ source-dir)))))
(ediff-dispatch-file-patching-job patch-buf source-file)))
(declare-function ediff-patch-buffer-internal "ediff-ptch"
diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el
index 387786ced0..74db053c97 100644
--- a/test/lisp/vc/ediff-ptch-tests.el
+++ b/test/lisp/vc/ediff-ptch-tests.el
@@ -21,6 +21,8 @@
(require 'ert)
(require 'ediff-ptch)
+(require 'ediff-diff) ; For `ediff-diff-program'.
+(eval-when-compile (require 'cl-lib))
(ert-deftest ediff-ptch-test-bug25010 ()
"Test for http://debbugs.gnu.org/25010 ."
@@ -104,6 +106,151 @@
(delete-directory tmpdir 'recursive)
(delete-file patch)))))
+(ert-deftest ediff-ptch-test-bug26028 ()
+ "Test for http://debbugs.gnu.org/26028 ."
+ (skip-unless (executable-find "git"))
+ (skip-unless (executable-find ediff-patch-program))
+ (skip-unless (executable-find ediff-diff-program))
+ (let ((git-program (executable-find "git"))
+ (default-dir default-directory)
+ tmpdir buffers)
+ ;;; Simple patch: old/src/hello.c /new/src/hello.c
+ (unwind-protect
+ (let* ((dir (make-temp-file "multipatch-test" t))
+ (file1 (expand-file-name "old/src/hello.c" dir))
+ (file2 (expand-file-name "new/src/hello.c" dir))
+ (patch (expand-file-name "tmp.patch" dir))
+ (default-directory (file-name-as-directory dir)))
+ (setq tmpdir dir)
+ (make-directory (expand-file-name "old/src/" dir) 'parents)
+ (make-directory (expand-file-name "new/src/" dir) 'parents)
+ (with-temp-buffer
+ (insert "void main() { }\n")
+ (write-region nil nil file1 nil 'silent)
+ (erase-buffer)
+ (insert "int main() { return 0; }\n")
+ (write-region nil nil file2 nil 'silent)
+ (erase-buffer)
+ (call-process ediff-diff-program nil t nil "-cr" "old" "new")
+ (write-region nil nil patch nil 'silent)
+ (cl-letf (((symbol-function 'y-or-n-p) (lambda (x) nil))
+ ((symbol-function 'ediff-prompt-for-patch-file)
+ (lambda (&rest x) (find-file-noselect patch)))
+ ((symbol-function 'read-file-name) (lambda (x1 x2 x3 x4 x5) x5))
+ ((symbol-function 'ediff-dispatch-file-patching-job)
+ (lambda (x y) y)))
+ (should (equal (file-relative-name file1) (epatch nil patch)))
+ (push (get-file-buffer patch) buffers))))
+ (when (file-exists-p tmpdir)
+ (setq default-directory default-dir)
+ (delete-directory tmpdir 'recursive))
+ (mapc (lambda (b)
+ (when (buffer-live-p b) (kill-buffer b)))
+ buffers)
+ (setq buffers nil))
+ ;;; Simple Git patch: proj/src/hello.c
+ (unwind-protect
+ (let* ((dir (make-temp-file "multipatch-test" t))
+ (rootdir (expand-file-name "proj/src/" dir))
+ (file (expand-file-name "hello.c" rootdir))
+ (patch (expand-file-name "tmp.patch" dir))
+ (default-directory (file-name-as-directory rootdir)))
+ (make-directory rootdir 'parents)
+ (setq tmpdir dir)
+ (with-temp-buffer
+ (insert "void main() { }\n")
+ (write-region nil nil file nil 'silent)
+ (call-process git-program nil nil nil "init")
+ (call-process git-program nil nil nil "add" ".")
+ (call-process git-program nil nil nil "commit" "-m" "test repository.")
+ (erase-buffer)
+ (insert "int main() { return 0; }\n")
+ (write-region nil nil file nil 'silent)
+ (call-process git-program nil `(:file ,patch) nil "diff")
+ (call-process git-program nil nil nil "reset" "--hard" "head")
+ (cl-letf (((symbol-function 'y-or-n-p) (lambda (x) nil))
+ ((symbol-function 'ediff-prompt-for-patch-file)
+ (lambda (&rest x) (find-file-noselect patch)))
+ ((symbol-function 'read-file-name) (lambda (&rest x) file))
+ ((symbol-function 'read-file-name) (lambda (x1 x2 x3 x4 x5) x5))
+ ((symbol-function 'ediff-dispatch-file-patching-job)
+ (lambda (x y) y)))
+ (should (equal file (epatch nil patch)))))
+ (push (get-file-buffer patch) buffers))
+ ;; clean up
+ (when (file-exists-p tmpdir)
+ (setq default-directory default-dir)
+ (delete-directory tmpdir 'recursive))
+ (mapc (lambda (b)
+ (when (buffer-live-p b) (kill-buffer b)))
+ buffers)
+ (setq buffers nil))
+ ;;; Git multipatch.
+ (unwind-protect
+ (let* ((dir (make-temp-file "multipatch-test" t))
+ (file1 (expand-file-name "proj/src/hello.c" dir))
+ (file2 (expand-file-name "proj/src/bye.c" dir))
+ (file3 (expand-file-name "proj/lisp/foo.el" dir))
+ (file4 (expand-file-name "proj/lisp/bar.el" dir))
+ (file5 (expand-file-name "proj/etc/news" dir))
+ (patch (expand-file-name "tmp.patch" dir))
+ (default-directory (expand-file-name "proj" dir)))
+ (setq tmpdir dir)
+ (dolist (d '("src" "lisp" "etc"))
+ (setq rootdir (expand-file-name (concat "proj/" d) dir))
+ (make-directory rootdir 'parents))
+ (with-temp-buffer
+ (insert "void main() { }\n")
+ (write-region nil nil file1 nil 'silent)
+ (write-region nil nil file2 nil 'silent)
+ (erase-buffer)
+ (insert "(defun foo () nil)\n")
+ (write-region nil nil file3 nil 'silent)
+ (erase-buffer)
+ (insert "(defun bar () nil)\n")
+ (write-region nil nil file4 nil 'silent)
+ (erase-buffer)
+ (insert "new functions 'foo' and 'bar'\n")
+ (write-region nil nil file5 nil 'silent)
+ (call-process git-program nil nil nil "init")
+ (call-process git-program nil nil nil "add" "src" "lisp" "etc")
+ (call-process git-program nil nil nil "commit" "-m" "test repository.");)
+ (erase-buffer)
+ (insert "int main() { return 0;}\n")
+ (write-region nil nil file1 nil 'silent)
+ (write-region nil nil file2 nil 'silent)
+ (erase-buffer)
+ (insert "(defun qux () nil)\n")
+ (write-region nil nil file3 nil 'silent)
+ (erase-buffer)
+ (insert "(defun quux () nil)\n")
+ (write-region nil nil file4 nil 'silent)
+ (erase-buffer)
+ (insert "new functions 'qux' and 'quux'\n")
+ (write-region nil nil file5 nil 'silent)
+ (call-process git-program nil `(:file ,patch) nil "diff")
+ (call-process git-program nil nil nil "reset" "--hard" "head"))
+ (cl-letf (((symbol-function 'y-or-n-p) (lambda (x) nil))
+ ((symbol-function 'ediff-get-patch-file) (lambda (&rest x) patch))
+ ((symbol-function 'read-file-name) (lambda (&rest x) patch)))
+ (epatch nil patch)
+ (with-current-buffer "*Ediff Session Group Panel*"
+ (push (get-file-buffer patch) buffers)
+ (should (= 5 (length (cdr ediff-meta-list))))
+ ;; don't ask confirmation to exit.
+ (cl-letf (((symbol-function 'y-or-n-p) (lambda (x) t)))
+ (ediff-quit-meta-buffer)))))
+ ;; clean up
+ (when (file-exists-p tmpdir)
+ (setq default-directory default-dir)
+ (delete-directory tmpdir 'recursive))
+ (when ediff-registry-buffer
+ (push ediff-registry-buffer buffers))
+ (mapc (lambda (b)
+ (when (buffer-live-p b) (kill-buffer b)))
+ buffers)
+ (setq buffers nil))))
+
(provide 'ediff-ptch-tests)
;;; ediff-ptch-tests.el ends here
--8<-----------------------------cut here---------------end--------------->8---
In GNU Emacs 26.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.11)
of 2017-05-23
Repository revision: 4a485410ce74cafd4e9c344e31f7575464a16113
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at 26028) by debbugs.gnu.org; 9 Mar 2017 11:44:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 09 06:44:25 2017
Received: from localhost ([127.0.0.1]:47198 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1clwUb-0001xD-EB
for submit <at> debbugs.gnu.org; Thu, 09 Mar 2017 06:44:25 -0500
Received: from forward1m.cmail.yandex.net ([5.255.216.2]:47474)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <sher-ars@HIDDEN>) id 1clwUZ-0001wz-NH
for 26028 <at> debbugs.gnu.org; Thu, 09 Mar 2017 06:44:24 -0500
Received: from smtp1m.mail.yandex.net (smtp1m.mail.yandex.net
[IPv6:2a02:6b8:0:2519::121])
by forward1m.cmail.yandex.net (Yandex) with ESMTP id E3BAA20D26;
Thu, 9 Mar 2017 14:44:16 +0300 (MSK)
Received: from smtp1m.mail.yandex.net (localhost.localdomain [127.0.0.1])
by smtp1m.mail.yandex.net (Yandex) with ESMTP id 9E88D63C0E9F;
Thu, 9 Mar 2017 14:44:12 +0300 (MSK)
Received: by smtp1m.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id
sbLWuDSpMU-iBYqOpR3; Thu, 09 Mar 2017 14:44:11 +0300
(using TLSv1.2 with cipher AES128-SHA256 (128/128 bits))
(Client certificate not present)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
t=1489059851; bh=rLTDGiizMyUtFMRkNpdIBLll5NiFPJzgFV6lhB3V+E4=;
h=From:To:Cc:Subject:References:Date:In-Reply-To:Message-ID;
b=esXEzg20dcnZIc0llkDzIpc+MRaae7cZsNDjLMng+ICtLqfOtvZyMJj6tfmkZNjIr
uaysIs5SFaxf7xpX0OZPtR8ZaYfpihD/sAee3eW+c6EED6OqBQvyCKFESJZE8C3UHE
kE1ImMFQCekhY0KCCfSQGqwE6mz5fk6vczIQJt40=
Authentication-Results: smtp1m.mail.yandex.net; dkim=pass header.i=@yandex.ru
X-Yandex-Suid-Status: 1 0,1 0,1 0,1 0
From: Arseny Sher <sher-ars@HIDDEN>
To: Tino Calancha <tino.calancha@HIDDEN>
Subject: Re: bug#26028: 26.0.50; epatch for multifile patches
References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN>
<87y3wfv3iy.fsf@HIDDEN> <87d1drfcqp.fsf@calancha-pc>
Date: Thu, 09 Mar 2017 14:44:11 +0300
In-Reply-To: <87d1drfcqp.fsf@calancha-pc> (Tino Calancha's message of "Thu, 09
Mar 2017 10:41:18 +0900")
Message-ID: <87shmmvfn8.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 26028
Cc: Michael Heerdegen <michael_heerdegen@HIDDEN>, 26028 <at> debbugs.gnu.org,
Eli Zaretskii <eliz@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
Tino Calancha <tino.calancha@HIDDEN> writes:
>> 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
Honestly, I didn't understand your answer.
1) I don't see any effects of changing the default directory. I set
default directory of buffer with patch to ~/tmp/proj as you say, then
run epatch, firstly point it to this buffer, then specify ~/tmp/proj
(because this is project root, and I want to patch the whole project!)
as target directory and it fails again, exactly as before.
2) Interpreting your instructions literally, I should specify
~/tmp/proj/src as target directory to ediff (answer to its last
question). Well, then it works, but this is precisely the behaviour
which doesn't make any sense to me: ediff just ignores the path to
file ('src' directory here). And it happens totally independent of
default directory value, I tried with different ones.
I suppose that the whole point of applying multifile patch is to allow
ediff deduce which files (with full paths) it needs to patch
automatically, without manually specifying dirs like 'src'. Imagine
we have also hello.h file under proj/include; then, if I tell ediff
to use ~/tmp/proj/src dir as target directory as you say, it will
successfully patch hello.c, but it will fail again attempting to
patch hello.h, because there is no such file proj/src/hello.h.
So, it is hard for me to suggest better epatch behaviour because I
actually don't comprehend its current one. I don't know why other people
don't encounter these problems. Probably they just apply patches via git
and only then look at the diff via ediff, and I should go the same
way...
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at 26028) by debbugs.gnu.org; 9 Mar 2017 01:41:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 08 20:41:30 2017
Received: from localhost ([127.0.0.1]:46894 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1cln58-0007eP-Jq
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 20:41:30 -0500
Received: from mail-pg0-f68.google.com ([74.125.83.68]:35924)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <tino.calancha@HIDDEN>) id 1cln57-0007eA-9a
for 26028 <at> debbugs.gnu.org; Wed, 08 Mar 2017 20:41:29 -0500
Received: by mail-pg0-f68.google.com with SMTP id 25so5043345pgy.3
for <26028 <at> 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)
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)
From: Tino Calancha <tino.calancha@HIDDEN>
To: Arseny Sher <sher-ars@HIDDEN>
Subject: Re: bug#26028: 26.0.50; epatch for multifile patches
References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN>
<87y3wfv3iy.fsf@HIDDEN>
Date: Thu, 09 Mar 2017 10:41:18 +0900
In-Reply-To: <87y3wfv3iy.fsf@HIDDEN> (Arseny Sher's message of "Thu, 09 Mar
2017 00:53:41 +0300")
Message-ID: <87d1drfcqp.fsf@calancha-pc>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 1.8 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: 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 [...]
Content analysis details: (1.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source
[74.125.83.68 listed in dnsbl.sorbs.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no
trust [74.125.83.68 listed in list.dnswl.org]
-0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[74.125.83.68 listed in wl.mailspike.net]
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
(tino.calancha[at]gmail.com)
-0.0 SPF_PASS SPF: sender matches SPF record
1.3 URI_HEX URI: URI hostname has long hexadecimal sequence
0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid
-0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
X-Debbugs-Envelope-To: 26028
Cc: Michael Heerdegen <michael_heerdegen@HIDDEN>, 26028 <at> debbugs.gnu.org,
Eli Zaretskii <eliz@HIDDEN>, tino.calancha@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.8 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: 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 [...]
Content analysis details: (1.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[74.125.83.68 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no
trust
[74.125.83.68 listed in list.dnswl.org]
0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source
[74.125.83.68 listed in dnsbl.sorbs.net]
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
(tino.calancha[at]gmail.com)
-0.0 SPF_PASS SPF: sender matches SPF record
1.3 URI_HEX URI: URI hostname has long hexadecimal sequence
0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid
-0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
Arseny Sher <sher-ars@HIDDEN> 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
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at 26028) by debbugs.gnu.org; 8 Mar 2017 21:53:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 08 16:53:53 2017
Received: from localhost ([127.0.0.1]:46793 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1cljWr-0000o1-Em
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 16:53:53 -0500
Received: from forward3m.cmail.yandex.net ([5.255.216.21]:50159)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <sher-ars@HIDDEN>) id 1cljWp-0000nn-GY
for 26028 <at> debbugs.gnu.org; Wed, 08 Mar 2017 16:53:52 -0500
Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net
[IPv6:2a02:6b8:0:1a2d::25])
by forward3m.cmail.yandex.net (Yandex) with ESMTP id AE79C216E3;
Thu, 9 Mar 2017 00:53:44 +0300 (MSK)
Received: from smtp1o.mail.yandex.net (localhost.localdomain [127.0.0.1])
by smtp1o.mail.yandex.net (Yandex) with ESMTP id 283B61300C13;
Thu, 9 Mar 2017 00:53:43 +0300 (MSK)
Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id
5PF9iSI40Z-rguOOMbm; Thu, 09 Mar 2017 00:53:42 +0300
(using TLSv1.2 with cipher AES128-SHA256 (128/128 bits))
(Client certificate not present)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
t=1489010022; bh=myB87SytBKvX1gpUX3/GnXmaWJGwGmShSR0ZASfO+ck=;
h=From:To:Cc:Subject:References:Date:In-Reply-To:Message-ID;
b=sKmroETg31kH/s1ww2K+TNCecu/UEyRSeWEIiOW+SjSZycaogGuN0JpfSy5z0luBY
1tJi0y09P89JdkJLJ++EjSY53RzXQXLk3UkA5ofIgHVFevd/vHSs0poUNgVBpt2BMg
m+5AWtgQv1GCt9EjquMXYoD2hKZZ9yCemK35DO5E=
Authentication-Results: smtp1o.mail.yandex.net; dkim=pass header.i=@yandex.ru
X-Yandex-Suid-Status: 1 0,1 0
From: Arseny Sher <sher-ars@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Subject: Re: bug#26028: 26.0.50; epatch for multifile patches
References: <87varjfzhr.fsf@HIDDEN> <838tofh93b.fsf@HIDDEN>
Date: Thu, 09 Mar 2017 00:53:41 +0300
In-Reply-To: <838tofh93b.fsf@HIDDEN> (Eli Zaretskii's message of "Wed, 08 Mar
2017 21:17:12 +0200")
Message-ID: <87y3wfv3iy.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.6 (/)
X-Debbugs-Envelope-To: 26028
Cc: 26028 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.6 (/)
Eli Zaretskii <eliz@HIDDEN> writes:
> 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.
Okay, it might be not very convenient (as you might have several
versions of project inside ~/tmp, and ediff will ask you which one is to
be patched), but it works. However, how then I am expected to apply
patches generated by VCS, where paths are prefixed with a/ and b/?
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?
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
And while I am here, I would like to express my gratitude to ediff
developers; it is in overall a great tool, and it is a pleasure to read
its manual. Thank you guys!
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at 26028) by debbugs.gnu.org; 8 Mar 2017 19:17:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 08 14:17:48 2017
Received: from localhost ([127.0.0.1]:46658 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1clh5o-0003Rk-Ci
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 14:17:48 -0500
Received: from eggs.gnu.org ([208.118.235.92]:58094)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <eliz@HIDDEN>) id 1clh5n-0003RY-4g
for 26028 <at> debbugs.gnu.org; Wed, 08 Mar 2017 14:17:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <eliz@HIDDEN>) id 1clh5e-0000Hf-Qx
for 26028 <at> debbugs.gnu.org; Wed, 08 Mar 2017 14:17:42 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD
autolearn=disabled version=3.3.2
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34173)
by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@HIDDEN>)
id 1clh5e-0000Ha-NS; Wed, 08 Mar 2017 14:17:38 -0500
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 <eliz@HIDDEN>)
id 1clh5d-00061c-Lt; Wed, 08 Mar 2017 14:17:38 -0500
Date: Wed, 08 Mar 2017 21:17:12 +0200
Message-Id: <838tofh93b.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Arseny Sher <sher-ars@HIDDEN>
In-reply-to: <87varjfzhr.fsf@HIDDEN> (message from Arseny Sher on Wed, 08
Mar 2017 20:29:52 +0300)
Subject: Re: bug#26028: 26.0.50; epatch for multifile patches
References: <87varjfzhr.fsf@HIDDEN>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 2001:4830:134:3::e
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: 26028
Cc: 26028 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Reply-To: Eli Zaretskii <eliz@HIDDEN>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)
> From: Arseny Sher <sher-ars@HIDDEN>
> 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.
bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 8 Mar 2017 17:33:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 08 12:33:11 2017
Received: from localhost ([127.0.0.1]:46565 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1clfSY-0006wX-VH
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 12:33:11 -0500
Received: from eggs.gnu.org ([208.118.235.92]:43930)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <sher-ars@HIDDEN>) id 1clfPd-0006qH-TM
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 12:30:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <sher-ars@HIDDEN>) id 1clfPW-0007q5-TR
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 12:30:04 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM,
T_DKIM_INVALID autolearn=disabled version=3.3.2
Received: from lists.gnu.org ([2001:4830:134:3::11]:36222)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <sher-ars@HIDDEN>) id 1clfPW-0007q1-QU
for submit <at> debbugs.gnu.org; Wed, 08 Mar 2017 12:30:02 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34894)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <sher-ars@HIDDEN>) id 1clfPU-0000Ov-Mx
for bug-gnu-emacs@HIDDEN; Wed, 08 Mar 2017 12:30:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <sher-ars@HIDDEN>) id 1clfPR-0007pB-EF
for bug-gnu-emacs@HIDDEN; Wed, 08 Mar 2017 12:30:00 -0500
Received: from forward13h.cmail.yandex.net ([87.250.230.155]:51185)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <sher-ars@HIDDEN>) id 1clfPQ-0007o2-Sh
for bug-gnu-emacs@HIDDEN; Wed, 08 Mar 2017 12:29:57 -0500
Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net
[IPv6:2a02:6b8:0:f05::116])
by forward13h.cmail.yandex.net (Yandex) with ESMTP id 624022209A
for <bug-gnu-emacs@HIDDEN>; Wed, 8 Mar 2017 20:29:54 +0300 (MSK)
Received: from smtp2h.mail.yandex.net (localhost.localdomain [127.0.0.1])
by smtp2h.mail.yandex.net (Yandex) with ESMTP id 4D7427819F6
for <bug-gnu-emacs@HIDDEN>; Wed, 8 Mar 2017 20:29:53 +0300 (MSK)
Received: by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id
OZKz1EonFv-TrRaV1qC; Wed, 08 Mar 2017 20:29:53 +0300
(using TLSv1.2 with cipher AES128-SHA256 (128/128 bits))
(Client certificate not present)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
t=1488994193; bh=mvl2ZIDJYANlEWdddQp+HuyR9OzlJvMML2usxqe7tY4=;
h=From:To:Subject:Date:Message-ID;
b=ZsprDKVIBLJ9ymtHgLVMi2K3+G2Ji6Kuu3oUVilkloH53sMCnUCHlnWqDOmxU+i4y
OHag0jMqBvWnXtkC/wlxR4f87ZbZ52v2YMpJzOcLGS0gDcg2yNY68/kkzzzJMaWtNc
FNcRyXTrc4w3/gyoSej2Vry06SH6CtN+6/1zTj6M=
Authentication-Results: smtp2h.mail.yandex.net; dkim=pass header.i=@yandex.ru
X-Yandex-Suid-Status: 1 0
From: Arseny Sher <sher-ars@HIDDEN>
To: bug-gnu-emacs@HIDDEN
Subject: 26.0.50; epatch for multifile patches
Date: Wed, 08 Mar 2017 20:29:52 +0300
Message-ID: <87varjfzhr.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 2001:4830:134:3::11
X-Spam-Score: -4.0 (----)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Wed, 08 Mar 2017 12:33:10 -0500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.0 (----)
Hello,
I am having trouble using epatch while applying multifile patches.
Consider the following simple example:
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.
Please enter an alternative patch target ...
because it ignores the path ('src' directory in this case) to the file.
Ediff manual says: "Ediff can recognize multi-file patches only if they
are in the context format or GNU unified format. All other patches are
treated as 1-file patches. Ediff is [hopefully] using the same algorithm
as patch to determine which files need to be patched." If I understand
this correctly, my scenario should work, so it seems like a bug.
I tried it on GNU Emacs versions 25.1, 25.2 RC2 and daily build
26.0.50.2, sometimes on clean Emacs (emacs -q), and sometimes with
unified diff format (diff -u), the result is the same.
I use GNU/Linux, Linux Mint 17 (based on Ubuntu 14.04).
Below goes autogenerated info from report-emacs-bug.
In GNU Emacs 26.0.50.2 (x86_64-pc-linux-gnu, GTK+ Version 3.10.8)
of 2016-10-26 built on lgw01-50
Windowing system distributor 'The X.Org Foundation', version 11.0.11501000
System Description: Linux Mint 17 Qiana
Recent messages:
my-misc loaded
Loading /home/ars/.emacs.d/recentf...done
Cleaning up the recentf list...done (0 removed)
my-text-processing loaded
Loading font-lock...done
my-windows-frames-funcs loaded
coding styles loaded
my-gdb-stuff loaded
Loading quail/cyrillic...done
For information about GNU Emacs and the GNU system, type C-h C-a.
Configured using:
'configure --build=x86_64-linux-gnu --prefix=/usr
'--includedir=${prefix}/include' '--mandir=${prefix}/share/man'
'--infodir=${prefix}/share/info' --sysconfdir=/etc --localstatedir=/var
'--libdir=${prefix}/lib/x86_64-linux-gnu'
'--libexecdir=${prefix}/lib/x86_64-linux-gnu' --disable-maintainer-mode
--disable-dependency-tracking --prefix=/usr --sharedstatedir=/var/lib
--program-suffix=-snapshot --with-modules=yes --with-x=yes
--with-x-toolkit=gtk3 --with-xwidgets=yes 'CFLAGS=-g -O2
-fstack-protector --param=ssp-buffer-size=4 -Wformat
-Werror=format-security' CPPFLAGS=-D_FORTIFY_SOURCE=2
'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro''
Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GCONF GSETTINGS
NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB
TOOLKIT_SCROLL_BARS GTK3 X11 MODULES XWIDGETS
Important settings:
value of $LC_ALL: en_US.UTF-8
value of $LC_MONETARY: ru_RU.UTF-8
value of $LC_NUMERIC: ru_RU.UTF-8
value of $LC_TIME: ru_RU.UTF-8
value of $LANG: en_US.UTF-8
locale-coding-system: utf-8-unix
Major mode: Fundamental
Minor modes in effect:
gud-tooltip-mode: t
diff-hl-flydiff-mode: t
global-diff-hl-mode: t
diff-auto-refine-mode: t
global-flycheck-mode: t
projectile-mode: t
ivy-mode: t
show-paren-mode: t
my-global-fci-mode: t
global-linum-mode: t
dired-omit-mode: t
delete-selection-mode: t
cua-mode: t
recentf-mode: t
savehist-mode: t
global-undo-tree-mode: t
global-auto-revert-mode: t
tooltip-mode: t
global-eldoc-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
blink-cursor-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
buffer-read-only: t
column-number-mode: t
line-number-mode: t
transient-mark-mode: t
Load-path shadows:
~/.emacs.d/static_packages/all-the-icons.el/all-the-icons hides ~/.emacs.d/static_packages/all-the-icons
/usr/share/emacs/site-lisp/dictionaries-common/ispell hides /usr/share/emacs/26.0.50/lisp/textmodes/ispell
/usr/share/emacs/site-lisp/dictionaries-common/flyspell hides /usr/share/emacs/26.0.50/lisp/textmodes/flyspell
/usr/share/emacs/site-lisp/latex-cjk-thai/thai-word hides /usr/share/emacs/26.0.50/lisp/language/thai-word
Features:
(shadow sort mail-extr emacsbug message puny format-spec rfc822 mml
mml-sec epa derived epg gnus-util rmail rmail-loaddefs mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils colir
color ggtags etags xref project windmove quail gud my-gdb-stuff
diff-hl-flydiff diff-hl edmacro kmacro face-remap vc-hg vc-git vc-dir
ewoc vc vc-dispatcher diff-mode flycheck json map find-func rx subr-x
coding-styles cc-styles cc-align cc-engine cc-vars cc-defs projectile
advice grep compile comint ansi-color ibuf-ext ibuffer ibuffer-loaddefs
ivy ivy-overlay ffap thingatpt xcscope ring paren disp-table
fill-column-indicator easy-mmode linum dired-x dired dired-loaddefs
my-windows-frames-funcs all-the-icons all-the-icons-faces
data-weathericons data-octicons data-fileicons data-faicons
data-alltheicons font-lock+ cl dash my-text-processing drag-stuff delsel
cua-base recentf tree-widget wid-edit savehist undo-tree diff autorevert
filenotify wombat-theme my-misc finder-inf tex-site info package
epg-config url-handlers url-parse auth-source cl-seq eieio eieio-core
cl-macs eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp
byte-compile cl-extra help-mode easymenu cconv cl-loaddefs pcase cl-lib
time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks
lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar
dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode
lisp-mode prog-mode register page menu-bar rfn-eshadow timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core
term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev
obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face
macroexp files text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget hashtable-print-readable backquote
dbusbind inotify dynamic-setting system-font-setting font-render-setting
xwidget-internal move-toolbar gtk x-toolkit x multi-tty
make-network-process emacs)
Memory information:
((conses 16 288745 21478)
(symbols 48 35267 1)
(miscs 40 517 1228)
(strings 32 74748 9913)
(string-bytes 1 2122820)
(vectors 16 35442)
(vector-slots 8 683178 9673)
(floats 8 665 276)
(intervals 56 444 300)
(buffers 976 13)
(heap 1024 41802 1607))
Arseny Sher <sher-ars@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#26028; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.