From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Package Eat on NonGNU ELPA diverged Date: Mon, 28 Nov 2022 20:21:32 +0000 Message-ID: <875yeyesoj.fsf@posteo.net> References: <87k03evoz8.fsf@disroot.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="39107"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Akib Azmain Turja Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Nov 28 21:22:34 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 1ozke8-0009wn-MG for ged-emacs-devel@m.gmane-mx.org; Mon, 28 Nov 2022 21:22:32 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozkdK-0001XU-Vv; Mon, 28 Nov 2022 15:21:43 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozkdI-0001WH-Mp for emacs-devel@gnu.org; Mon, 28 Nov 2022 15:21:41 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozkdG-0001Ez-TX for emacs-devel@gnu.org; Mon, 28 Nov 2022 15:21:40 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 15ABA240028 for ; Mon, 28 Nov 2022 21:21:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1669666895; bh=jpmbNY8RZHShEIHsj6spiWMw6DDCB9fYoL62OmX1PiE=; h=From:To:Cc:Subject:Date:From; b=XC3d9Nlmvqnc+KLIHo8YWO4nqkjjyfFjbdf7ehc3AIPswsfOUHuCGvwo76Vz++NEu J9fkT6ax4cGjfJaCmDr4FX9AT/Wv72T0oQKgJnS3AXMRZNOAjEC9TXA2Ut1ISM+5RO wpdCx4rZKM461Cyuo8egSms8rWPTwKSnK8tGTCUF8+OTly79k9jX9XH/6qeMndfNt7 WR3IBXhBFnyq9oXgccO5iAw9Ghl/075tZ171rlg4wlzvXbBuFDrYQVbKwYI0Qv+e64 qnQ+naQOzf64oVjWaK+Dq6wJLQDt08x7m1flRbx5tfi2TNmQlDLLsT+zmEEK7n3cpt hLzuBZEgrNpPw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NLcLj2l8Sz6tm6; Mon, 28 Nov 2022 21:21:30 +0100 (CET) In-Reply-To: <87k03evoz8.fsf@disroot.org> (Akib Azmain Turja's message of "Tue, 29 Nov 2022 01:49:31 +0600") Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:300685 Archived-At: Akib Azmain Turja writes: > I mistakenly wrote a commit message with a lot of mistakes, and > unfortunately I also pushed it immediately. After some 10-20 minutes, > I noticed the thing and quickly fixed that commit message (but not the > files) and force pushed it. But within that 10-20 minutes, ELPA > machinery fetch from my repository, and now the two repositories > diverged. > > Is there any chance to do something on ELPA side, or do I have to do > something on my side? IIRC You could add the ELPA mirror as a remote, then merge the diverged branch onto your own and push that.