* flymake-proselint has diverged
@ 2022-04-09 23:26 Stefan Monnier
2022-04-10 5:07 ` Manuel Uberti
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Monnier @ 2022-04-09 23:26 UTC (permalink / raw)
To: Manuel Uberti; +Cc: emacs-devel
Hi Manuel,
We have a problem with `flymake-proselint` on GNU ELPA because the code
in `elpa.git` has diverged from that in the upstream:
% make fetch/flymake-proselint
emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "flymake-proselint"
Fetching updates for flymake-proselint...
Upstream of flymake-proselint has DIVERGED!
Local changes:
1d240a7b69 manuel-uberti@.. Move to SourceHut
Upstream changes:
2031f3df76 manuel.uberti@.. Update format
de88c00d8b manuel.uberti@.. Update URL
%
The GNU ELPA code can only be updated via fast-forward, so could you
please merge commit 1d240a7b69 into your upstream?
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: flymake-proselint has diverged
2022-04-09 23:26 flymake-proselint has diverged Stefan Monnier
@ 2022-04-10 5:07 ` Manuel Uberti
2022-04-10 5:33 ` Stefan Monnier
0 siblings, 1 reply; 5+ messages in thread
From: Manuel Uberti @ 2022-04-10 5:07 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
On 10/04/22 01:26, Stefan Monnier wrote:
> Hi Manuel,
Hi Stefan
> We have a problem with `flymake-proselint` on GNU ELPA because the code
> in `elpa.git` has diverged from that in the upstream:
>
> % make fetch/flymake-proselint
> emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "flymake-proselint"
> Fetching updates for flymake-proselint...
> Upstream of flymake-proselint has DIVERGED!
>
> Local changes:
> 1d240a7b69 manuel-uberti@.. Move to SourceHut
>
> Upstream changes:
> 2031f3df76 manuel.uberti@.. Update format
> de88c00d8b manuel.uberti@.. Update URL
>
> %
>
> The GNU ELPA code can only be updated via fast-forward, so could you
> please merge commit 1d240a7b69 into your upstream?
Thank you for spotting this. I merged the commit and pushed the change,
hopefully without getting it wrong.
Let me know if you need me to do something else. My git-fu is rather
limited.
--
Manuel Uberti
https://manueluberti.eu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: flymake-proselint has diverged
2022-04-10 5:07 ` Manuel Uberti
@ 2022-04-10 5:33 ` Stefan Monnier
2022-04-10 5:43 ` Manuel Uberti
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Monnier @ 2022-04-10 5:33 UTC (permalink / raw)
To: Manuel Uberti; +Cc: emacs-devel
Manuel Uberti [2022-04-10 07:07:46] wrote:
> Thank you for spotting this. I merged the commit and pushed the change,
> hopefully without getting it wrong.
Looks like you applied an "identical" change rather than merging the
actual commit:
% make fetch/flymake-proselint
emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "flymake-proselint"
Fetching updates for flymake-proselint...
Upstream of flymake-proselint has DIVERGED!
Local changes:
1d240a7b69 manuel-uberti@.. Move to SourceHut
Upstream changes:
42b3ffa259 manuel-uberti@.. Move to SourceHut
2031f3df76 manuel.uberti@.. Update format
de88c00d8b manuel.uberti@.. Update URL
%
IOW maybe you used `rebase` rather then `merge`?
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: flymake-proselint has diverged
2022-04-10 5:33 ` Stefan Monnier
@ 2022-04-10 5:43 ` Manuel Uberti
2022-04-10 14:17 ` Stefan Monnier
0 siblings, 1 reply; 5+ messages in thread
From: Manuel Uberti @ 2022-04-10 5:43 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
On 10/04/22 07:33, Stefan Monnier wrote:
> Looks like you applied an "identical" change rather than merging the
> actual commit:
>
> % make fetch/flymake-proselint
> emacs --no-site-lisp --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "flymake-proselint"
> Fetching updates for flymake-proselint...
> Upstream of flymake-proselint has DIVERGED!
>
> Local changes:
> 1d240a7b69 manuel-uberti@.. Move to SourceHut
>
> Upstream changes:
> 42b3ffa259 manuel-uberti@.. Move to SourceHut
> 2031f3df76 manuel.uberti@.. Update format
> de88c00d8b manuel.uberti@.. Update URL
>
> %
>
> IOW maybe you used `rebase` rather then `merge`?
Yep, sorry, as I said my git-fu is rather limited. I tried again, this
time step-by-step with git merge.
--
Manuel Uberti
https://manueluberti.eu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-10 14:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-09 23:26 flymake-proselint has diverged Stefan Monnier
2022-04-10 5:07 ` Manuel Uberti
2022-04-10 5:33 ` Stefan Monnier
2022-04-10 5:43 ` Manuel Uberti
2022-04-10 14:17 ` Stefan Monnier
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).