From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Tue, 01 Nov 2022 16:23:43 +0100 Message-ID: <8735b2itq8.fsf@gmx.de> References: <87v8o0hrk2.fsf@gmx.de> <88f2ba22-64c4-c835-294e-9367766161e5@gmail.com> <87bkprhw7r.fsf@gmx.de> <48c054670f70ff7b056a@heytings.org> <877d0eiywf.fsf@gmx.de> <48c054670f6a015a2cca@heytings.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="37372"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Gerd =?utf-8?Q?M=C3=B6llmann?= , emacs-devel@gnu.org To: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 01 18:10:46 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 1opumk-0009Xm-FW for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 18:10:46 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opt7J-0002ve-3G; Tue, 01 Nov 2022 11:23:53 -0400 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 1opt7H-0002tz-48 for emacs-devel@gnu.org; Tue, 01 Nov 2022 11:23:51 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opt7F-0006bj-E6 for emacs-devel@gnu.org; Tue, 01 Nov 2022 11:23:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1667316224; bh=5GUcSfOVVUZMTVqvyiyZ/0New/BEeICLmpCvn5pKon0=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=A4ROdSwt8IGJR7ALA3RnmZz9Mxs5ncn3CUx0Pqqm4SrkuB9TyQqiAoG6hcs4XbbZ+ FbNOrUg4IEO/mfylsEjqEXGKdbEJbadnQkguLtxC9J0EW3HdF9wVhVDIq5m4Ccke/N czBJSVQluAWT+4w2pYIeHgRW3WFDiJRvXdjDgZtiV2ubIA3ExQsQYyVhnbHJ7XnRdo LpywSsyMAqTH0MWmJZKGWC1pKvGCcgnC/4j104XXlaEnZ04Utzf0c5bbJOogipYcu0 r+71NXXDEhieJlAjuHNuLEkyNc5LT8IZ+SeqAp5m505HHK8XyZVn/u9q5XXCF99mcW Xbg82Erp03dWA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([79.140.125.69]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MaJ3n-1oUjmH1emz-00WFrQ; Tue, 01 Nov 2022 16:23:44 +0100 In-Reply-To: <48c054670f6a015a2cca@heytings.org> (Gregory Heytings's message of "Tue, 01 Nov 2022 13:55:09 +0000") X-Provags-ID: V03:K1:Rxc4fn45EQ4ZK359kDjZJhjs8j1RGwc1gxYt73I35g8zjrcJ9Rs xAJ4Y9XAnFQDJDA2K5ULLKZphGPCKHOtRxjFJCaNYPZuGbUjxvFhZbgvguKiLVfiYAFaCA8 wLY/sncRRiKqY8cdM/Ft7LrFYF2wlRvIpRRuciMDHgT7J+byVbocPXgJrZ3oof/Pa5Fnn41 l+yvDdQYGfBGzsGOUDbkg== UI-OutboundReport: notjunk:1;M01:P0:zZx01YJlp7k=;9OwYZ3NWfNFNt6MxLOgnV8lkPkB 7EmJGCP4aNA5xYkfLvg5yzXagS1Th/J9JV3XC4dQ3ZZyiEBDGofj04SJKtm1TxoxAcXCDJoJt nvYum6CQJawib0s27NOxIwJF8nv1jsJ9CE+iTzV1oDRe9PbWd6xkqN9aLl1iksWsd/L+NrX5d z2wjv6DvM6JpI0bo18/5gkcw/LwW+nMLgXfIyxogacCDetsaxb2RleTIJFmrU36xO2cDr+DrE WsGO8KwQ03GCkY0iHV5C1Sq+upyNsEcdQv/IRiVV9I5kkZhqCcKJ4rcLOQg/Rul+LHIqWqgcK AA2YU/sPicLmN7NCWVlrc4vVYfHvBGnt23y/v/kCZvEHrSHumpOLQD9EvF9KuMl/E3mzUORj+ oqg8i+rBaiRfv4Ni/J+VSxHC/NIaezMFN1J7VQRyAcee5NtzV5NpTLbIaSNw0ypantAX5r6Rs ogNEO8SpuFxCyjs0jZlLF5M2yJ1fWxAsxQxujfmrg6zBj0ytYMNeC6/oUvcmMyB1hLlVsbafs GIzfoWmrgTRmq0Px5vO9U1w2JtfcPYJW6MBFTojW1LmBL2+GbZRSmBpszDVLu3bgPS1CTlUeZ aGFIQ6x8D0nStGS6khH7S5NNGSc6ZX67M993LR44ongHlDt6PjGVlmVEPyipe28ayrYQqenJo t0X+LNQMSjCjkH/775oOkPrPZj65d9+NxERuPjzYMEzL9POsn5R3OJMbs7tcrJ+jNnpMslWhZ pyQgd/fLvCFjs+Ybmx7muN8x+4BqbvB3SNKHmEqO+KXvPz5pMhqmgG8vmR+swHULCwxJX/AC Received-SPF: pass client-ip=212.227.15.15; envelope-from=michael.albinus@gmx.de; helo=mout.gmx.net 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298942 Archived-At: Gregory Heytings writes: Hi Gregory, > I don't know what happened exactly, but the Eglot tree has another > root, so when you are inside that branch you should not see any of the > files that are part of the Emacs tree (e.g. "Makefile" and > "configure"). What was the cause of your confusion? Exactly this: all files were lost, I thought. I'm not so fluent with git, and so I did panic. >> - If the bad commit is inside the merge, you won't see it, because >> you have marked the whole merged subtree as good (by marking the >> last commit of the merged subtree). > > By definition, the bad commit cannot be inside the merged Eglot tree, > because that three contains only Eglot, not Emacs. It bad commit > could be the merge commit, but that one is not excluded during the > bisection if you mark the last commit before the merge as "good". That's the eglot case. I was speaking about a merge in general. >> - It would require manual actions, because first you need to >> determine the range of the merged subtree in order to mark last >> commit of this. > > That is correct, and it is the price to pay to preserve history when a > tree with another root is merged. Sigh. > Perhaps we could maintain a list of such merges somewhere, with the > commit SHA of the last commit before each merge. Or perhaps even a > commented script, that would do a "git bisect good ..." for each such > commit. Don't know, I let it to the git aficionados. Best regards, Michael.