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:43:52 +0200 Message-ID: References: <55179671-238c-c78b-4938-0790e192e688@inventati.org> 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="31226"; 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:47:37 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 1ndQQC-0007wm-FH for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 07:47:36 +0200 Original-Received: from localhost ([::1]:35596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndQQA-0007dr-Ul for ged-emacs-devel@m.gmane-mx.org; Sun, 10 Apr 2022 01:47:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndQMm-0006gG-B1 for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:44:04 -0400 Original-Received: from latitanza.investici.org ([2001:888:2000:56::19]:37175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndQMk-0000re-2h for emacs-devel@gnu.org; Sun, 10 Apr 2022 01:44:03 -0400 Original-Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4Kbgs70vTZzGp4v; Sun, 10 Apr 2022 05:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1649569435; bh=q+7uhp1uEhMJnjqML5DcbJnKWifKlLI5MmzGTFTsaCM=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=j2QYU898u8CX18Weg0DR3fmshuHLwsdFItpYORt+uQWQdMYT6Vj7T4978x44h5VIm bLFejXzSkEjIkPgneriWOMgthu1m2tdGBbhx+9YtqpgOIUonZWd9q+L55IwZljj3fd QiPm0HD0f7eRPxS2Q57zLKvFIoowL+sLM6JRdy/U= 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 4Kbgs66hZmzGp4t; Sun, 10 Apr 2022 05:43:54 +0000 (UTC) Content-Language: en-GB In-Reply-To: Received-SPF: pass client-ip=2001:888:2000:56::19; 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, 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:288092 Archived-At: 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