From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30 Date: Tue, 16 Jul 2024 16:14:30 +0800 Message-ID: <874j8pzrbt.fsf@yahoo.com> References: <172109631090.17973.7449765348063658289@vcs2.savannah.gnu.org> <20240716021832.68243C2BC71@vcs2.savannah.gnu.org> <87cyndyd1j.fsf@gmx.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13059"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jul 16 10:16:31 2024 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 1sTdMN-0003EI-0q for ged-emacs-devel@m.gmane-mx.org; Tue, 16 Jul 2024 10:16:31 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTdLg-0006JU-LM; Tue, 16 Jul 2024 04:15:49 -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 1sTdLJ-0006A1-QZ for emacs-devel@gnu.org; Tue, 16 Jul 2024 04:15:27 -0400 Original-Received: from sonic316-22.consmr.mail.ne1.yahoo.com ([66.163.187.148]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sTdL5-0007V8-PG for emacs-devel@gnu.org; Tue, 16 Jul 2024 04:15:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1721117708; bh=LGz7NzPaxkXftFhXxp3wmBsVqTTBSstoJxSXSZlZVYs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=D75mHO97F5qCrpiqHQgmjfwaHoKD426o4GfxQdRvD+6TcbxBi2EvImH8zXyeebNYJiVWADM9N4B8WuWktEVimixtUbvCTarlFQePrDjMBW1GXNawMByn9d95CEzSZee6ZF9kZG1gZoSfT+DDYCdw8yAVaXZoz0xvWTqpfC4oYe1kDu4n+DPAjmMNyoIaCHDxPzuyZB8vCdi6JnyVQfpqvkvO1+A96K2lS+3Hr86N3i5F8wQNeQXKeQZGxCP3djn4DeoPK3HzU+xvk5IWPWeBpAhWS3AyjaaHWbGsfYiEW3+nQvudbgytJUbwNJm06KvF0SDjgFSahs6fbl5wGgQqpg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1721117708; bh=41xczZc0nXu3RZWI4aweCGu9wnoqolpLCFv+Lm9SkdH=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=l0JqSXDSTTU1XNUxhDHXVqBgLwoTeybSp3uvVn6jwOpUhlLgUtvGlkUsjw/CUo5qLl1N60qc945/bUYomE15FMXCKq++WL42gKELEz49wcSDcHFdzqY5GNu5SEm2e94gIKR/tjxeLBLCa4AgnhLda0TdwAGlRyvbIAhIPqL97d19rNt9gdNPlIwHizD2J1hP+VdZEOn7eLUMIxtHE+VzT/MoeaHT8By4ZlFMvl7dcR29ODgSPnz5NA5V6mMqbdY3qM4LoakM0klOuuIg4TXIp3nmr2ZuC4LzTErIxr6LTtA1ji9KyQVxGMZX/752h6hyLKsP4LD3X/d60mt8Dh90KQ== X-YMail-OSG: kOzdh8UVM1mjXzxACDmqOXtnFzdX7jVpm_UJ6czC.oVXGwlPyrnAincl8cNQbgG ROAQlvGDNzt0A._ZU6KPR8IcUEXOZupT.bo7.5pIsnyGjeOE__f8pAumCKI6bJpTa0.4BEEfAoSH KM.BxWCfmk_QZAvi0qWr3K50LM4PbXrWXeLNfYbhFvcMFyeUpuVVvK3DuChzMGE.heAq3Ol_NIOc G0sf.sc9Te2ehLfuUGO8aAvqP17dP7vzshOL59vMhwv64nwfux46IDM9vGkZL8jT1xDpbFujjngD sEAzey84Sn6K327cGFz5sj.xM_W1dKqcX_pQXbRJ2bAcPYT8bJYC2Ruv7FxFjrSArBtoRtJQQKpr F_Ka5hiaeHVBZpwx4VqVwgMcmd7oUd2nDKisF6VqrfIKCkzPxfy29dmj1_3Xsda1ouna8P0ixsdx y8q3hFGpMXRFsLlmQqUVzY88WbycSxUtmjNW8KRixi1jiAdSFZAvoNz2Mn91wOw.5nBk4yX2VwfH XzeX3vOGPjHt8yYYbwhKLSRkTAzdEtF__y3ISkYXYyeDUjyeoVWFIwybzXoTQ136SnfsA8XeUH72 3U0rAErrVL.y85MrLlrtpf82vmve.2eUnL5OZNgmLAgzRYbCWarY_UyQPAFCjBRgWwKDmCK.2A1z kkDjlQlhQjMV4QriKl2LNJlIfZwwjN49EgBKuVZsDqrmqD4UEfwCDk2Tn9nkJ8TCk9zo_jfm7mtQ Y1zCmhMNxk8RfjwJuhpDVklvmdodnjp392.pzdAHE8XvAVjU4_CExvV8vA7ALQOoJV2.pZ8cR0yJ hVViCE.RurBQn0PwusPMUYRDIFu.SWS5jD9lGt0gi8 X-Sonic-MF: X-Sonic-ID: b392af2e-a1f1-4cc6-ace7-4ed6f83590dc Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.ne1.yahoo.com with HTTP; Tue, 16 Jul 2024 08:15:08 +0000 Original-Received: by hermes--production-sg3-85fdb5cfc8-wlzth (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 315410c48b09275ef6fd8f0f39528946; Tue, 16 Jul 2024 08:14:59 +0000 (UTC) In-Reply-To: <87cyndyd1j.fsf@gmx.de> (Michael Albinus's message of "Tue, 16 Jul 2024 10:08:24 +0200") X-Mailer: WebService/1.1.22501 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.187.148; envelope-from=luangruo@yahoo.com; helo=sonic316-22.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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: , 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:321689 Archived-At: Michael Albinus writes: > Po Lu via Mailing list for Emacs changes writes: > > Hi, > >> branch: master >> commit 35606d575b8830174874b9ddcc24ed8243071f53 >> Merge: f54ad127eec 684e96a30d9 >> Author: Po Lu >> Commit: Po Lu >> >> ; Merge from savannah/emacs-30 >> >> The following commit was skipped: >> >> 684e96a30d9 Adapt tressitter tests on EMBA > > Is there a reason you have skipped this change? It is intended for both > emacs-30 and master branches. Escapes me. I simply assented to choices proposed by admin/gitmerge.el. The offending portion of the commit message is: Adapt tressitter tests on EMBA * test/infra/Makefile.in (TREE-SITTER-FILES): Simplify. * test/infra/test-jobs.yml: Regenerate. ^^^^^^^^^^^ Which matches `gitmerge-skip-regexp'.