From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Brian Leung Newsgroups: gmane.emacs.bugs Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Date: Fri, 09 Dec 2022 12:43:12 +0000 Message-ID: <87bkocrbfe.fsf@posteo.net> References: <87r0x8rie6.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11485"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59921@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 09 13:48:21 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p3cnb-0002mE-AO for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 09 Dec 2022 13:48:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3cnM-0005of-Kv; Fri, 09 Dec 2022 07:48:04 -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 1p3cnK-0005nF-Gu for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:48:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3cnK-0007Cu-7f for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3cnJ-0001Gz-R5 for bug-gnu-emacs@gnu.org; Fri, 09 Dec 2022 07:48:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 09 Dec 2022 12:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59921 X-GNU-PR-Package: emacs Original-Received: via spool by 59921-submit@debbugs.gnu.org id=B59921.16705900684887 (code B ref 59921); Fri, 09 Dec 2022 12:48:01 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 9 Dec 2022 12:47:48 +0000 Original-Received: from localhost ([127.0.0.1]:35921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3cn5-0001Gl-RZ for submit@debbugs.gnu.org; Fri, 09 Dec 2022 07:47:48 -0500 Original-Received: from mout01.posteo.de ([185.67.36.65]:56675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3cn4-0001Ge-0T for 59921@debbugs.gnu.org; Fri, 09 Dec 2022 07:47:46 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 778FB240027 for <59921@debbugs.gnu.org>; Fri, 9 Dec 2022 13:47:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1670590059; bh=I14I2BTgtvjmpyFgptWwKRVySACkVy+Xjz3T7mGn3lc=; h=From:To:Cc:Subject:Date:From; b=RtQGHBjkNLCDhfRKjrhqqZlYvr0VFJRJyFp344zCEzGsmeVMhpF484Em/aPVskTeu FBgM7YFQyJ+jrea17aMGONJx3o/kiSJWI3ZcYifYHZza3FYUYt5IvQs/pd+tjcTs0g k2ehVWR28H0jxyHpd9SJkzHAC5rvkBEftJSr/iTCnJYKiUIA+AkoWceEzc+Kr+vld3 EAqrUzBsec8O2eoGW1EViw3hBBDG4vlD5OCvJUpRheSnvay3Y/V8tH0snH1L6LdjTD 4/AJeOUBw+eHo55zUnJI7TVarscevbPvS8DDHpRfpYCzij+RU7CuufHl8X5vLJZ4rt tw502envtCqXQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NT9lq5G1hz9rxL; Fri, 9 Dec 2022 13:47:35 +0100 (CET) In-reply-to: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250391 Archived-At: Stefan Kangas writes: > Brian Leung writes: > >> For example, >> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c83c95634e7a8d0f334ac5d45eebf357e413906c >> and >> https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2 >> are not in Emacs 30, at the time of writing, whereas some newer >> Emacs 29 >> commits are on master. > > Here's what I see: > > $ git fetch > [...] > $ git branch -a --contains > b710ca62c00ef90a46fc90a9ae06fdf3bba87bc2 | > grep master > master > remotes/origin/HEAD -> origin/master > remotes/origin/master > $ git branch -a --contains > c83c95634e7a8d0f334ac5d45eebf357e413906c | > grep master > master > remotes/origin/HEAD -> origin/master > remotes/origin/master > > Doesn't this mean that these commits are on the master branch? I arrived at a similar conclusion using Magit. I don't have a great understanding of Git, so my best guess is that 64c7b57ae72 somehow skipped over more commits than expected. You can verify that the changes corresponding to the missing commits are present in the emacs-29 branch but not in master.