From: Eli Zaretskii <eliz@gnu.org>
To: Arseny Sher <sher-ars@yandex.ru>
Cc: 26028@debbugs.gnu.org
Subject: bug#26028: 26.0.50; epatch for multifile patches
Date: Wed, 08 Mar 2017 21:17:12 +0200 [thread overview]
Message-ID: <838tofh93b.fsf@gnu.org> (raw)
In-Reply-To: <87varjfzhr.fsf@yandex.ru> (message from Arseny Sher on Wed, 08 Mar 2017 20:29:52 +0300)
> From: Arseny Sher <sher-ars@yandex.ru>
> 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.
next prev parent reply other threads:[~2017-03-08 19:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 17:29 bug#26028: 26.0.50; epatch for multifile patches Arseny Sher
2017-03-08 19:17 ` Eli Zaretskii [this message]
2017-03-08 21:53 ` Arseny Sher
2017-03-09 1:41 ` Tino Calancha
2017-03-09 11:44 ` Arseny Sher
2017-05-23 11:26 ` Tino Calancha
2017-05-23 22:45 ` Michael Heerdegen
2017-05-24 0:46 ` Tino Calancha
2020-08-11 7:34 ` Stefan Kangas
2020-10-03 22:25 ` Michael Heerdegen
2021-05-10 12:02 ` Lars Ingebrigtsen
2021-05-12 9:27 ` Michael Heerdegen
2021-05-13 16:29 ` Filipp Gunbin
2021-05-16 13:57 ` Lars Ingebrigtsen
2021-07-23 12:54 ` Lars Ingebrigtsen
2022-03-24 8:34 ` Lars Ingebrigtsen
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=838tofh93b.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=26028@debbugs.gnu.org \
--cc=sher-ars@yandex.ru \
/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).