From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 21:03:45 +0200 Message-ID: <87bl5g9icg.fsf@gnu.org> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> <1ed3f32a6594bd1591d2c359c748846e@thornhill.no> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22670"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.6.5; emacs 28.0.50 Cc: philipk@posteo.net, danflscr@gmail.com, Drew DeVault , monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org, emacs-devel@gnu.org, Eli Zaretskii To: theo@thornhill.no Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 21:13:03 2021 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 1mKQEp-0005hX-4i for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 21:13:03 +0200 Original-Received: from localhost ([::1]:32898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKQEn-0005jP-QF for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 15:13:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKQDP-0004bp-Rj for emacs-devel@gnu.org; Sun, 29 Aug 2021 15:11:35 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:50096) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKQDO-0005JF-Tn; Sun, 29 Aug 2021 15:11:34 -0400 Original-Received: from auth2-smtp.messagingengine.com ([66.111.4.228]:33447) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKQDO-0005PE-Ot; Sun, 29 Aug 2021 15:11:34 -0400 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailauth.nyi.internal (Postfix) with ESMTP id 1D36E27C0054; Sun, 29 Aug 2021 15:11:33 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 29 Aug 2021 15:11:34 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddruddujedgudefudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvffuffgjkfggtgesthdtredttdertdenucfhrhhomhepvfgrshhs ihhlohcujfhorhhnuceothhsughhsehgnhhurdhorhhgqeenucggtffrrghtthgvrhhnpe ejudekudelfedvveekgfelueeufeegtedtvdekiedvtdfftdfhgfdvveetjeffffenucff ohhmrghinhepshhrrdhhthenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehthhhorhhnodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithih qdekieejfeekjeekgedqieefhedvleekqdhtshguhheppehgnhhurdhorhhgsehfrghsth hmrghilhdrfhhm X-ME-Proxy: Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 29 Aug 2021 15:11:31 -0400 (EDT) In-reply-to: <1ed3f32a6594bd1591d2c359c748846e@thornhill.no> X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:273429 Archived-At: theo@thornhill.no writes: Hi Theo, > Repo with double edits: > https://git.sr.ht/~theo/rebase/log > > Ok, so what happens? > > 1. Make some commits, push them > 2. Rebase your stuff locally, get this warning after: Well, looking at "git log --graph" of your repo, I'm pretty sure you ended there because in step 2 you rebased commits which you had already pushed and later merged the upstream branch with the locally rebased one. Rebasing commits which are already pushed is a no-go unless you are working in your private branch. Bye, Tassilo