From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 11:45:03 +0300 Message-ID: <83y28kljw0.fsf@gnu.org> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6571"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org To: "Drew DeVault" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 10:46:58 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 1mKGSw-0001VA-5r for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:46:58 +0200 Original-Received: from localhost ([::1]:33740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGSu-0002Gc-MY for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 04:46:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGRP-0001UJ-5c for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:45:23 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:32872) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGRJ-000111-6r; Sun, 29 Aug 2021 04:45:18 -0400 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:3347 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGRI-0004Vx-AH; Sun, 29 Aug 2021 04:45:16 -0400 In-Reply-To: (sir@cmpwn.com) 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:273392 Archived-At: > Date: Sun, 29 Aug 2021 10:23:17 +0200 > Cc: , , , > , , , > > From: "Drew DeVault" > > On Sun Aug 29, 2021 at 10:21 AM CEST, Eli Zaretskii wrote: > > I no longer remember the exact details, it was something we bumped > > into during discussions when Emacs switched to Git. AFAIR, it had to > > do with working on a feature branch and frequently rebasing it onto > > the latest master (so that the feature branch doesn't diverge too > > much), then later merging from the feature branch to master. > > Hm, weird. I would like to see some reproducible evidence of this so > that a deeper investigation can be done. I've used rebase thoroughly for > many years on hundreds of projects without any such incident. It is buried in this long discussion: https://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01436.html AFAIR, it had to do with "pull --rebase" as well, and the fact that when doing the rebases in this case, Git "invents" anonymous branches. Or something.