From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: flymake-proselint has diverged Date: Sun, 10 Apr 2022 01:33:01 -0400 Message-ID: References: <55179671-238c-c78b-4938-0790e192e688@inventati.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15322"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Manuel Uberti Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 10 07:34:41 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 1ndQDg-0003mA-KL for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 07:34:40 +0200 Original-Received: from localhost ([::1]:33400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndQDf-0005U0-4q for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 01:34:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndQCD-0004ms-Dt for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:33:09 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:21592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndQCA-0007nc-ON for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:33:08 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id E85A1805C8; Sun, 10 Apr 2022 01:33:04 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id F24FB80385; Sun, 10 Apr 2022 01:33:02 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1649568782; bh=5+/lMih5QbKSW9dSV6cy6HNEHDO0DHu9oXo1R76P73o=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=dqnWcPTTwyKPkbzmLqoqa/Xt/8nBXRO1gZMbQdNPGpZCh6SYUKYSKb5IF2alryosd UhRJmxVnBuraKRViKTykRPaaEJDIQvx0mB2abxt387q/79EcaQ0jbKaawL+8/8tsPZ NN/VP1sJtfYsz2ipTxZSJUqepu0aQCLTMab/wsAknmoshiO4KCDg5buCbGEQmVCuiM r+0czwZ4CPwJSvrUD8Zg003u7LeQgksTyHsnTWexKfhYi0+Ns/MZl7ub/jgmwaBuT7 /Tf02MxIvYsAYRgsvR1yelmi07z6fqXmsiU7t+pJKRNsSRllsrQ4p4OLavUJA6hlys LUmhIivASEyxg== Original-Received: from pastel (unknown [45.72.221.51]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id A479D12014A; Sun, 10 Apr 2022 01:33:02 -0400 (EDT) In-Reply-To: <55179671-238c-c78b-4938-0790e192e688@inventati.org> (Manuel Uberti's message of "Sun, 10 Apr 2022 07:07:46 +0200") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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:288091 Archived-At: 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