From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Uberti Newsgroups: gmane.emacs.devel Subject: Re: flymake-proselint has diverged Date: Sun, 10 Apr 2022 07:07:46 +0200 Message-ID: <55179671-238c-c78b-4938-0790e192e688@inventati.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24405"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 10 07:09:12 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ndPp2-0006AN-Gp for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 07:09:12 +0200 Original-Received: from localhost ([::1]:57360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndPp1-0001NA-FI for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 01:09:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndPnu-0000gJ-Tu for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:08:05 -0400 Original-Received: from latitanza.investici.org ([82.94.249.234]:55861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndPns-0004hb-E2 for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:08:02 -0400 Original-Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4Kbg3S2hrWzGp4v; Sun, 10 Apr 2022 05:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1649567268; bh=CTRsH1Dk6/mIHOzxqxjWz8Mt/P8aW4ExGAJ2lz+hkO4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=qDWE5BdwhhwEnSBAdL/uEI0KYrlny247RCe/wLK59vzEr2NAP4K0zWLJs4qD+YYQn yD0e+ISeaCbvtUGaObrs9kpD1M5dO/cQAw45otkRJB8xLzttFb5Qu7/b9v/WAQWTzV 08MEVGN8r1s3NSxWU87m2J34zeOkGUYUQmWg/wqQ= Original-Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: manuel.uberti@inventati.org) by localhost (Postfix) with ESMTPSA id 4Kbg3S1ZzBzGp4t; Sun, 10 Apr 2022 05:07:48 +0000 (UTC) Content-Language: en-GB In-Reply-To: Received-SPF: pass client-ip=82.94.249.234; envelope-from=manuel.uberti@inventati.org; helo=latitanza.investici.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:288089 Archived-At: 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