From: Alan Third <alan@idiocy.org>
To: "Charles A. Roelli" <charles@aurox.ch>
Cc: 26816@debbugs.gnu.org
Subject: bug#26816: mouse movement support for OS X
Date: Tue, 16 May 2017 23:53:01 +0100 [thread overview]
Message-ID: <20170516225301.GA49449@breton.holly.idiocy.org> (raw)
In-Reply-To: <76527b19-1f31-0642-ac3a-8e55fd9b0a90@aurox.ch>
On Mon, May 15, 2017 at 08:23:27PM +0200, Charles A. Roelli wrote:
> Patch is attached, with a commit message.
For some reason I can’t apply this patch. It looks fine, and I can’t
see what the problem is at all.
Do you have commit access to the repository? If so then I don’t
suppose it matters if I can’t apply it locally, but if not then either
I need to fix this or someone else needs to push it for you.
Here’s the error from magit, in case it means something to someone:
128 git … am --3way -- /Users/alan/0001-Fix-macOS-mouse-movement.patch
Applying: Fix macOS mouse movement
Using index info to reconstruct a base tree...
M src/nsfns.m
M src/nsterm.m
error: patch failed: test/lisp/mouse-tests.el:47
error: test/lisp/mouse-tests.el: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 Fix macOS mouse movement
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
Alan Third
next prev parent reply other threads:[~2017-05-16 22:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-07 15:11 bug#26816: mouse movement support for OS X Charles A. Roelli
2017-05-07 16:51 ` Eli Zaretskii
2017-05-08 18:34 ` Charles A. Roelli
2017-05-08 18:54 ` Eli Zaretskii
2017-05-07 18:07 ` martin rudalics
2017-05-07 20:00 ` Alan Third
2017-05-09 19:09 ` Charles A. Roelli
2017-05-09 22:44 ` Alan Third
2017-05-11 18:06 ` Charles A. Roelli
2017-05-11 21:43 ` Alan Third
2017-05-14 13:29 ` Charles A. Roelli
2017-05-14 13:59 ` Alan Third
2017-05-14 14:37 ` Eli Zaretskii
2017-05-15 18:23 ` Charles A. Roelli
2017-05-16 22:53 ` Alan Third [this message]
2017-05-17 8:36 ` Andreas Schwab
2017-05-18 19:43 ` Charles A. Roelli
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=20170516225301.GA49449@breton.holly.idiocy.org \
--to=alan@idiocy.org \
--cc=26816@debbugs.gnu.org \
--cc=charles@aurox.ch \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.