From: Andreas Gruenbacher <andreas.gruenbacher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Eric Blake <eblake-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: bug-patch-mXXj517/zsQ@public.gmane.org,
Git Mailing List <git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: rejecting patches that have an offset
Date: Wed, 17 Aug 2011 00:48:07 +0200 [thread overview]
Message-ID: <1313534889.5598.21.camel@schurl.linbit> (raw)
In-Reply-To: <4E49A8EA.5020507-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Eric,
On Mon, 2011-08-15 at 17:16 -0600, Eric Blake wrote:
> It would have saved me a lot of time if both 'patch' and 'git apply'
> could be taught a mode of operation where they explicitly reject a patch
> that cannot be applied without relying on an offset.
that sounds reasonable. Can you send a patch or at least add a bug on
Savannah?
> It might also be nice if patch could learn the algorithm that appears to
> match the git behavior, where when there are multiple points with
> identical context (viewing just the context in isolation), but where
> those locations differ in function location (as learned by the @@ header
> line in the patch file), then the preferred offset is the one in the
> named function, even if that is not the closes context match to the line
> number given in the patch file.
Sounds interesting; a patch for that would be great as well.
Thanks,
Andreas
next prev parent reply other threads:[~2011-08-16 22:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-15 23:16 rejecting patches that have an offset Eric Blake
[not found] ` <4E49A8EA.5020507-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2011-08-16 22:48 ` Andreas Gruenbacher [this message]
2011-08-16 23:10 ` [bug-patch] " Eric Blake
2011-08-16 23:22 ` Junio C Hamano
[not found] ` <7vobzpeybh.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2011-08-16 23:41 ` Eric Blake
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313534889.5598.21.camel@schurl.linbit \
--to=andreas.gruenbacher-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=bug-patch-mXXj517/zsQ@public.gmane.org \
--cc=eblake-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/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.
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 NNTP newsgroup(s).