unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Tino Calancha <tino.calancha@gmail.com>
To: Kaushal Modi <kaushal.modi@gmail.com>
Cc: Michael Heerdegen <michael_heerdegen@web.de>,
	Alan Mackenzie <acm@muc.de>,
	Emacs developers <emacs-devel@gnu.org>
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)	[thread overview]
Message-ID: <alpine.DEB.2.20.1705232010490.28720@calancha-pc> (raw)
In-Reply-To: <CAFyQvY3TW8sUrSBL7f8FxL7eZLVdEffw7gCGmmpMK3J81nsSFg@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]



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

  parent reply	other threads:[~2017-05-23 11:21 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-15 20:44 Proposal: new mode-line `%'-construct %o meaning "Degree of travel of window through buffer" Alan Mackenzie
2017-05-15 23:27 ` Paul Eggert
2017-05-15 23:29   ` Drew Adams
2017-05-15 23:54 ` Kaushal Modi
2017-05-16  0:38 ` Noam Postavsky
2017-05-16  1:15   ` Clément Pit-Claudel
2017-05-16  2:47     ` Eli Zaretskii
2017-05-18  1:15   ` Perry E. Metzger
2017-05-18  4:28     ` Eli Zaretskii
2017-05-18 16:01       ` Perry E. Metzger
2017-05-18 16:18         ` Eli Zaretskii
2017-05-18 16:45           ` Perry E. Metzger
2017-05-18 19:43             ` Eli Zaretskii
2017-05-18 20:13               ` Perry E. Metzger
2017-05-18 20:25                 ` Eli Zaretskii
2017-05-18 20:51                   ` Perry E. Metzger
2017-05-19  6:17                     ` Eli Zaretskii
2017-05-22  2:22                       ` Kaushal Modi
2017-05-22  4:13                         ` Eli Zaretskii
2017-05-22 13:38                           ` Kaushal Modi
2017-05-22 18:20                             ` Alan Mackenzie
2017-05-22 18:55                               ` Kaushal Modi
2017-05-16  3:00 ` Eli Zaretskii
2017-05-16  3:35   ` Noam Postavsky
2017-05-16 20:37   ` Alan Mackenzie
2017-05-17  2:30     ` Eli Zaretskii
2017-05-17 21:32     ` Alan Mackenzie
2017-05-18 19:16       ` Dani Moncayo
2017-05-18 21:22         ` Alan Mackenzie
2017-05-19  5:32         ` Yuri Khan
2017-05-16  7:22 ` Andreas Schwab
2017-05-16 10:05   ` Dani Moncayo
2017-05-16 13:31     ` Drew Adams
2017-05-16 18:59     ` Toon Claes
2017-05-16 20:56       ` John Yates
2017-05-20 10:34 ` Proposal: new mode-line `%'-construct %o meaning "Degree of travel of window through buffer". [Patch] Alan Mackenzie
2017-05-21 15:55   ` Difficulty applying multi-file patches from within emacs (Was: Proposal: new mode-line `%'-construct %o ..) Kaushal Modi
2017-05-21 16:04     ` Noam Postavsky
2017-05-22  1:19       ` Kaushal Modi
2017-05-22  2:35         ` Noam Postavsky
2017-05-21 16:08     ` Difficulty applying multi-file patches from within emacs Alan Mackenzie
2017-05-21 17:20       ` Philipp Stephani
2017-05-21 17:39         ` Alan Mackenzie
2017-05-22  1:21           ` Kaushal Modi
2017-05-22  1:23             ` Kaushal Modi
2017-05-23 11:21     ` Tino Calancha [this message]
2017-05-23  8:00   ` Proposal: new mode-line `%'-construct %o meaning "Degree of travel of window through buffer". [Patch] Dani Moncayo
2017-05-23 20:24     ` Alan Mackenzie
2017-05-24 10:45       ` Dani Moncayo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.20.1705232010490.28720@calancha-pc \
    --to=tino.calancha@gmail.com \
    --cc=acm@muc.de \
    --cc=emacs-devel@gnu.org \
    --cc=kaushal.modi@gmail.com \
    --cc=michael_heerdegen@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).