* Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30
[not found] ` <20240716021832.68243C2BC71@vcs2.savannah.gnu.org>
@ 2024-07-16 8:08 ` Michael Albinus
2024-07-16 8:14 ` Po Lu
0 siblings, 1 reply; 3+ messages in thread
From: Michael Albinus @ 2024-07-16 8:08 UTC (permalink / raw)
To: emacs-devel; +Cc: Po Lu
Po Lu via Mailing list for Emacs changes <emacs-diffs@gnu.org> writes:
Hi,
> branch: master
> commit 35606d575b8830174874b9ddcc24ed8243071f53
> Merge: f54ad127eec 684e96a30d9
> Author: Po Lu <luangruo@yahoo.com>
> Commit: Po Lu <luangruo@yahoo.com>
>
> ; 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.
Note, that the previous change on EMBA control files in the emacs-30
branch, ce4f56caf71, was also skipped. It is uncomfortable for me, to
check always whether my contributions to the emacs-30 branch reach also
master :-(
Best regards, Michael.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30
2024-07-16 8:08 ` master 35606d575b8 2/4: ; Merge from savannah/emacs-30 Michael Albinus
@ 2024-07-16 8:14 ` Po Lu
2024-07-16 8:21 ` Michael Albinus
0 siblings, 1 reply; 3+ messages in thread
From: Po Lu @ 2024-07-16 8:14 UTC (permalink / raw)
To: Michael Albinus; +Cc: emacs-devel
Michael Albinus <michael.albinus@gmx.de> writes:
> Po Lu via Mailing list for Emacs changes <emacs-diffs@gnu.org> writes:
>
> Hi,
>
>> branch: master
>> commit 35606d575b8830174874b9ddcc24ed8243071f53
>> Merge: f54ad127eec 684e96a30d9
>> Author: Po Lu <luangruo@yahoo.com>
>> Commit: Po Lu <luangruo@yahoo.com>
>>
>> ; 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'.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: master 35606d575b8 2/4: ; Merge from savannah/emacs-30
2024-07-16 8:14 ` Po Lu
@ 2024-07-16 8:21 ` Michael Albinus
0 siblings, 0 replies; 3+ messages in thread
From: Michael Albinus @ 2024-07-16 8:21 UTC (permalink / raw)
To: Po Lu; +Cc: emacs-devel
Po Lu <luangruo@yahoo.com> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-16 8:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <172109631090.17973.7449765348063658289@vcs2.savannah.gnu.org>
[not found] ` <20240716021832.68243C2BC71@vcs2.savannah.gnu.org>
2024-07-16 8:08 ` master 35606d575b8 2/4: ; Merge from savannah/emacs-30 Michael Albinus
2024-07-16 8:14 ` Po Lu
2024-07-16 8:21 ` Michael Albinus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).