From: "João Távora" <joaotavora@gmail.com>
To: Payas Relekar <relekarpayas@gmail.com>,
Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Progress on merging Eglot?
Date: Mon, 19 Sep 2022 17:09:46 +0100 [thread overview]
Message-ID: <CALDnm51rEP-eKH96MjR-UKCMBUGu+JhLB+sg9j00zvnf9fursA@mail.gmail.com> (raw)
In-Reply-To: <87edw7z97x.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
On Mon, Sep 19, 2022 at 4:52 PM Payas Relekar <relekarpayas@gmail.com>
wrote:
>
> > The only problem is that I can't get run the full eglot2emacs.sh to run.
> > The process is blocked, I think, by an Emacs commit hook that refuses to
> > accept some trailing changes in some unrelated files. Can you see
> > what's up with that? Did I mess up eglot2emacs.sh?
> >
>
> .py is well beyond my kindergarten python, but if I had to make a guess
> its probably generating something that Emacs doesn't like.
>
No, that wasn't it. It probably worked for you because your script clones
a fresh
emacs.git repo without installing the pre-commit hooks. When they are in
place,
the merge is prevented. I haven't investigated why: there is some logic in
~/.git/hooks/pre-commit that supposedly nullifies the hook for merges.
Anyway, when the hook is laid to rest, the result is something like what I
just uploaded to the scratch/eglot2emacs branch:
This branch will probably be deleted and re-created frequently as we tweak
the script.
I hope that isn't a problem. Stefan?
João
[-- Attachment #2: Type: text/html, Size: 1624 bytes --]
next prev parent reply other threads:[~2022-09-19 16:09 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 15:12 Progress on merging Eglot? Payas Relekar
2022-09-19 16:09 ` João Távora [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-19 16:32 Payas Relekar
2022-09-19 16:59 ` João Távora
2022-09-19 13:11 Payas Relekar
2022-09-19 14:28 ` João Távora
2022-09-19 15:50 ` Payas Relekar
2022-09-18 16:55 Payas Relekar
2022-09-08 16:48 Payas Relekar
2022-09-08 17:09 ` João Távora
2022-09-08 17:09 ` Payas Relekar
2022-09-08 17:16 ` João Távora
2022-09-08 17:26 ` Payas Relekar
2022-09-18 16:31 ` Payas Relekar
2022-09-18 20:30 ` Philip Kaludercic
2022-09-18 20:47 ` Dmitry Gutov
2022-09-18 21:00 ` Philip Kaludercic
2022-09-18 21:11 ` Dmitry Gutov
2022-09-18 21:13 ` João Távora
2022-09-18 21:12 ` João Távora
2022-09-18 21:20 ` Philip Kaludercic
2022-09-18 21:24 ` João Távora
2022-09-19 2:37 ` Stefan Monnier
2022-09-19 4:25 ` Payas Relekar
2022-09-19 4:42 ` Payas Relekar
2022-09-19 7:23 ` João Távora
2022-09-19 9:09 ` Payas Relekar
2022-09-19 9:25 ` Payas Relekar
2022-09-19 9:17 ` Payas Relekar
2022-09-19 14:09 ` João Távora
2022-09-19 12:25 ` Stefan Monnier
2022-09-08 12:31 Payas Relekar
2022-09-08 13:09 ` João Távora
2022-09-08 13:55 ` Philip Kaludercic
2022-09-08 14:02 ` João Távora
2022-09-08 14:14 ` Philip Kaludercic
2022-09-08 14:24 ` Payas Relekar
2022-09-08 14:44 ` Philip Kaludercic
2022-09-08 14:47 ` João Távora
2022-09-08 14:54 ` Payas Relekar
[not found] ` <CALDnm50tiazUMnm9D3knBUCSLbT4FLvSPoX4ayUEmOtQSHbCtw@mail.gmail.com>
[not found] ` <87r10lor2c.fsf@gmail.com>
2022-09-08 16:08 ` João Távora
2022-09-08 14:26 ` João Távora
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=CALDnm51rEP-eKH96MjR-UKCMBUGu+JhLB+sg9j00zvnf9fursA@mail.gmail.com \
--to=joaotavora@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=relekarpayas@gmail.com \
/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.