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: master 35606d575b8 2/4: ; Merge from savannah/emacs-30 Date: Tue, 16 Jul 2024 10:21:11 +0200 Message-ID: <878qy1ycg8.fsf@gmx.de> References: <172109631090.17973.7449765348063658289@vcs2.savannah.gnu.org> <20240716021832.68243C2BC71@vcs2.savannah.gnu.org> <87cyndyd1j.fsf@gmx.de> <874j8pzrbt.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="336"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jul 16 10:22:06 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 1sTdRl-000AQ2-GJ for ged-emacs-devel@m.gmane-mx.org; Tue, 16 Jul 2024 10:22:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTdR4-0007w0-GH; Tue, 16 Jul 2024 04:21:23 -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 1sTdR0-0007tC-Kz for emacs-devel@gnu.org; Tue, 16 Jul 2024 04:21:18 -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 1sTdQz-0000Kg-4L for emacs-devel@gnu.org; Tue, 16 Jul 2024 04:21:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1721118072; x=1721722872; i=michael.albinus@gmx.de; bh=ditZrmruRdiOOpsid/MKo/8qWvRn8lfkmXolDomPbzw=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=of9ktHfkNBkfHs0QA+oqQjITbL85/fzXa2euBULaFwAVsQZ/ypUaEAXmedDNeHdU oWJ9BvVIiSi0wG6NeUTLnlpb18aYD2ThILOSNyfpfjX7a/VzhI5GD8oFf32LeVA8k CLyOwCgH2J84uFfsygGeU3R25ZbeRUxB3dzqVjzRcsDk+Qsu+aZtRkNDQje6d4RHm TvdRd5JKqH5Udw8xWqX59uHBT7o6YIC+C1TGv+sE2VRQmFenbxJT1u/LTmuIqARaL +nu2+DGj+blOHqIoJ454YKGIwffyOZbq56nq4XkTWyu6u/Cr3h3DPG71TMx0p/e/M fcB99vn5rPWQyUhHwA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MpDJd-1rzlqh1wzP-00iFWr; Tue, 16 Jul 2024 10:21:12 +0200 In-Reply-To: <874j8pzrbt.fsf@yahoo.com> (Po Lu's message of "Tue, 16 Jul 2024 16:14:30 +0800") X-Provags-ID: V03:K1:4+4REPfzp+cbzQc0cfyLY5IZCylG174/i0o4oPz3VPP8zMdD8R2 bFQnryaAkxztRPQppMZNZ47ORZrGADPef8yUQyD3tPLzrdExEE4e5YuTzg8F44Ia5EwXpYK 1baawdrvJh5ulCCCoGlWgsEjEcOTRGf6rvBS3xYvIQNo2xy97oHi4/qnDMmiAz14vrleWWy /O55+TRZJDJBxEHrBiqsQ== UI-OutboundReport: notjunk:1;M01:P0:1AaPIW/pDCE=;RdnHWcTDCRlR/Ify6bAhFfdoPLX 1Xf7UdgZBVMpSn6PtlL0WauC6a3nI81ZwPKfJfNk/ZWxSNNVopo0NIEFeKaA6092wiD/oErF+ 41iT+846iA+WB6sK5H7lRA3WOCpkfxumqL0xLT09c1vevIKCpab1nOUWiBIbiD4zPqbKTGAJe ZxmOQiTJ0V7dzCaFpp9WGKEf0KaX9Css2SjLuw/5EutVz/jlsm6TlblYekz+g+TV/iYzxLAZo HbF/wdJd0dWCgi0YJYrX00cIW7GE34s1sb8s1BJnPIyxfTTD7YqUW1iXX1OFXakAo730VNuNx VMm37hbr/TMk+K0hb9aaBwCVIOVDJPgfYONt8zX4D6LIOFOrCO4McCjivQ9vAE6Irou78efq0 DdM373ut/A1lBzK7uPCtZTaqF+eEJuD3NGEoHxQpMp5iWzzZWxK+NgDOjGouNHvM4OHVHKZo+ aF/qj0qhKYnDVYqEavzy7NNosdk+Steduh5OmCzI5z/DomV8xvemIsD1AF+X98Bu8PEGaxxaI CsYHtZOn6fht3++3oLGO+QtL6Yv/Gtnhta/jC3IelEOM8XtY2C+Lvth9eNbrycFGnTOkFQx+R 9t83CP83+eRxjplQDaWHlHemx3xfArg7xmsx57yA3boCAFHdGTRTkehQyrB4YZsCmoVs6Yh1Y eyvz6EXBtiILqocix+DZS1ZOX7rBxjJu833gOLtBRaCpvVZJKxNHt/mfOMyvdObFiQTRdM9Fm G/B6x5GPCu5DxlowzdSqqX9SyiB9tQ8ID96DNz3FslVxlJ5SZgeOqPtzWAHUtHmOV3yVGDwr Received-SPF: pass client-ip=212.227.15.15; envelope-from=michael.albinus@gmx.de; helo=mout.gmx.net X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:321690 Archived-At: Po Lu writes: Hi, >> 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'. I see. I'll take a note *not* to use this buzzword in the future. Best regards, Michael.