From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.devel Subject: Re: Difficulty applying multi-file patches from within emacs (Was: Proposal: new mode-line `%'-construct %o ..) Date: Tue, 23 May 2017 20:21:11 +0900 (JST) Message-ID: References: <20170515204416.GA7349@acm.fritz.box> <20170520103428.GB4616@acm.fritz.box> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="8323329-944254921-1495538474=:28720" X-Trace: blaine.gmane.org 1495538715 26584 195.159.176.226 (23 May 2017 11:25:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 23 May 2017 11:25:15 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: Michael Heerdegen , Alan Mackenzie , Emacs developers To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 23 13:25:07 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dD7w2-0006cJ-Hi for ged-emacs-devel@m.gmane.org; Tue, 23 May 2017 13:25:06 +0200 Original-Received: from localhost ([::1]:47786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD7w5-00005n-SC for ged-emacs-devel@m.gmane.org; Tue, 23 May 2017 07:25:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD7sP-0006Aq-UG for emacs-devel@gnu.org; Tue, 23 May 2017 07:21:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD7sL-0007OA-0x for emacs-devel@gnu.org; Tue, 23 May 2017 07:21:21 -0400 Original-Received: from mail-pf0-x234.google.com ([2607:f8b0:400e:c00::234]:36445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD7sK-0007Np-RQ for emacs-devel@gnu.org; Tue, 23 May 2017 07:21:16 -0400 Original-Received: by mail-pf0-x234.google.com with SMTP id m17so111790347pfg.3 for ; Tue, 23 May 2017 04:21:16 -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=74jOWt+Uu0MQ54dhRiyqXg+pg+SCWulKWSfDCaavQd8=; b=o73I8Vzb3tZf8ZfOO5tekqTL6+eIz3jXhmzv6cwhz3KuvgC8aX6V44VkwBhaDxyfnO z7d902WPZKy4VB923SxrWBZuHtYTZwkDzGdnIxh2JCwn2C06+IpBEUZtBNXP9PPw63/h ONfhbjQgrVUYjtLFEihc9OpkCWIy2U5dFLJhvV64tyOWOZJtz/wHAwtkFQ7FmkvQcHhq msCUC96sB391n9hojpZvQ5phx+/gNr57bXnmO50BXB6tSc2A6uBm+A8fKr6SFr3r+Z91 APBk8bd/GHgKm9ePnQj+QMZThSGOg/dOX6QEDIJqbkHhW78fscjx3pZlTs0X8Dv7OFiL x/0g== 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=74jOWt+Uu0MQ54dhRiyqXg+pg+SCWulKWSfDCaavQd8=; b=uYLhIqXqiQImMZB42GYssLLF6lZccDhT/Hxmv2Seul73xejdodyBjyFh2Fzmnj0k9A EqSUW237rY8JiY3YcFnONJ+1KvJOWM6470O5hOro6ZV7z5fIzVUfDK0YrIedAwgb8oMJ YL5+XHUl5JUtC1VJczUIIeAAcAdJ2HfpH8dVbTcZtoAmVZw+dUOoS1UnUo6NeaF5N6z+ quOl6tSaM1OcAmUrHJGxg0XVeu5ZIeVu10zhFhLTi62mZME1fl7HGFMBUXW7B4IrXhfO qj5OlSh5zBX77fChmaey0J+Rk+ArPjD5Yz8ulC9GGzZumkkCTgnQwKc6S3FV/oeoDZu/ tH6g== X-Gm-Message-State: AODbwcBUdoP/Oa4TVe0L5uyqgY8jRRWsL5w9m6gPachrePXKItp2uBCV DX8kab+ehuQ5Zw== X-Received: by 10.98.153.153 with SMTP id t25mr31629887pfk.160.1495538475956; Tue, 23 May 2017 04:21:15 -0700 (PDT) Original-Received: from calancha-pc (222.139.137.133.dy.bbexcite.jp. [133.137.139.222]) by smtp.gmail.com with ESMTPSA id m8sm1885947pga.34.2017.05.23.04.21.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 04:21:15 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::234 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215126 Archived-At: --8323329-944254921-1495538474=:28720 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Sun, 21 May 2017, Kaushal Modi wrote: > I attempted M-x ediff-patch-file. > > But then I ended with with an issue which is well-described by Michael (copied on this email) in a thread on help-gnu-emacs back > in Feb this year: http://lists.gnu.org/archive/html/help-gnu-emacs/2017-02/msg00035.html > > It's the same issue that when I specify the root dir for all the patches to be applied, ediff-patch-file in my case (epatch in > the case in that Feb 2017 thread) does not parse the subdirs for the unified diff format headers. > > In that thread, Eli suggests using patch utility directly from the command-line. But I really wished ediff-patch-file/epatch > worked correctly when applying multi-file patches. > > So the reason for this thread is: > > - Has anyone been able to apply multi-file patches from within emacs? If so, how? > - If someone has worked out the issues with ediff-patch-file/epatch for this issue and the solution is lying around in their > workarea, it would be awesome if they provided a patch to fix it upstream :) > - I followed that Feb 2017 help thread, and it wasn't clear if a solution was reached.. was it? Well, i am not really using `ediff-patch-file' (a.k.a. `epatch') but i have an old patch for this issue. That said, i don't think this patch is the ultimate solution, but at least improves the current situation a bit. I am going to post it in Bug#26028. Tino --8323329-944254921-1495538474=:28720--