From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Andreas Schwab <schwab@suse.de>
Cc: emacs-devel@gnu.org
Subject: Re: diff-apply-hunk documentation doesn't match implementation
Date: Tue, 13 Mar 2007 10:36:57 -0400 [thread overview]
Message-ID: <jwvabyhtdtg.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <jeird6b77k.fsf@sykes.suse.de> (Andreas Schwab's message of "Mon\, 12 Mar 2007 20\:19\:27 +0100")
>> In your case, the patch specifies two files which diff-mode can both find,
>> yet, the patch is not between those two files (at least in your test case,
>> the two files are just the same, presumably one being a "working tree" and
>> the other being basically unrelated).
> The patch is relative to an older version of the file, my intention was to
> find out which parts of it have already been applied, and apply those that
> aren't (and some hunks need editing to apply, so I couldn't just ignore
> the rejects).
So, there was fundamentally only 1 file, right?
It just so happened that diff-mode found 2 different matching files (one for
the "old" and one for the "new"), but it was unintended?
>> Is your test case very representative, or are there many other different
>> cases where you bump into the same problem?
> It's actually the first time I used that feature. For me this behaviour
> was very confusing, even before I read the doc string of diff-apply-hunk.
> Especially more so because it also automatically moves forward so that the
> effect is not immediately visible.
I'm not sure what you mean by "this behaviour". I guess the confusing
behavior is mostly the inconsistency between diff-goto-source and
diff-apply-hook, is that right?
Stefan
next prev parent reply other threads:[~2007-03-13 14:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-11 12:00 diff-apply-hunk documentation doesn't match implementation Andreas Schwab
2007-03-11 21:54 ` Stefan Monnier
2007-03-11 22:23 ` Andreas Schwab
2007-03-12 14:30 ` Stefan Monnier
2007-03-12 14:32 ` Andreas Schwab
2007-03-12 15:20 ` Stefan Monnier
2007-03-12 15:29 ` Andreas Schwab
2007-03-12 18:54 ` Stefan Monnier
2007-03-12 19:19 ` Andreas Schwab
2007-03-13 14:36 ` Stefan Monnier [this message]
2007-03-13 15:45 ` Andreas Schwab
2007-03-14 15:13 ` Stefan Monnier
2007-03-14 16:41 ` Andreas Schwab
2007-03-14 18:57 ` Stefan Monnier
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=jwvabyhtdtg.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=schwab@suse.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).