all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Manuel Uberti <manuel.uberti@inventati.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: flymake-proselint has diverged
Date: Sun, 10 Apr 2022 07:07:46 +0200	[thread overview]
Message-ID: <55179671-238c-c78b-4938-0790e192e688@inventati.org> (raw)
In-Reply-To: <jwvk0bx264a.fsf-monnier+emacs@gnu.org>

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



  reply	other threads:[~2022-04-10  5:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-09 23:26 flymake-proselint has diverged Stefan Monnier
2022-04-10  5:07 ` Manuel Uberti [this message]
2022-04-10  5:33   ` Stefan Monnier
2022-04-10  5:43     ` Manuel Uberti
2022-04-10 14:17       ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55179671-238c-c78b-4938-0790e192e688@inventati.org \
    --to=manuel.uberti@inventati.org \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /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.