* Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
[not found] ` <20240113103754.667A6C00227@vcs2.savannah.gnu.org>
@ 2024-01-13 16:39 ` Stephen Berman
2024-01-13 16:59 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Berman @ 2024-01-13 16:39 UTC (permalink / raw)
To: emacs-devel; +Cc: Eli Zaretskii
On Sat, 13 Jan 2024 05:37:54 -0500 (EST) Eli Zaretskii <eliz@gnu.org> wrote:
> branch: master
> commit fe7d2bb62fb4a618362ffa787ed1d1a3bda4a4dd
> Merge: f1736571fa3 26eb9d3a8a6
> Author: Eli Zaretskii <eliz@gnu.org>
> Commit: Eli Zaretskii <eliz@gnu.org>
>
> ; Merge from origin/emacs-29
>
> The following commit was skipped:
>
> 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
Because of this, the typo stills exists on master. Is this due to my
having mistakenly committed the change to master and then reverting it
and committing it to emacs-29? Does it now have to be manually
installed to master as well?
Steve Berman
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
2024-01-13 16:39 ` master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29 Stephen Berman
@ 2024-01-13 16:59 ` Eli Zaretskii
2024-01-13 17:12 ` Stephen Berman
0 siblings, 1 reply; 4+ messages in thread
From: Eli Zaretskii @ 2024-01-13 16:59 UTC (permalink / raw)
To: Stephen Berman; +Cc: emacs-devel
> From: Stephen Berman <stephen.berman@gmx.net>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Sat, 13 Jan 2024 17:39:23 +0100
>
> On Sat, 13 Jan 2024 05:37:54 -0500 (EST) Eli Zaretskii <eliz@gnu.org> wrote:
>
> > branch: master
> > commit fe7d2bb62fb4a618362ffa787ed1d1a3bda4a4dd
> > Merge: f1736571fa3 26eb9d3a8a6
> > Author: Eli Zaretskii <eliz@gnu.org>
> > Commit: Eli Zaretskii <eliz@gnu.org>
> >
> > ; Merge from origin/emacs-29
> >
> > The following commit was skipped:
> >
> > 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
>
> Because of this, the typo stills exists on master. Is this due to my
> having mistakenly committed the change to master and then reverting it
> and committing it to emacs-29?
I guess so, yes.
> Does it now have to be manually installed to master as well?
Yes, please.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
2024-01-13 16:59 ` Eli Zaretskii
@ 2024-01-13 17:12 ` Stephen Berman
2024-01-13 17:32 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Berman @ 2024-01-13 17:12 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Stephen Berman <stephen.berman@gmx.net>
>> Cc: Eli Zaretskii <eliz@gnu.org>
>> Date: Sat, 13 Jan 2024 17:39:23 +0100
>>
>> On Sat, 13 Jan 2024 05:37:54 -0500 (EST) Eli Zaretskii <eliz@gnu.org> wrote:
>>
>> > branch: master
>> > commit fe7d2bb62fb4a618362ffa787ed1d1a3bda4a4dd
>> > Merge: f1736571fa3 26eb9d3a8a6
>> > Author: Eli Zaretskii <eliz@gnu.org>
>> > Commit: Eli Zaretskii <eliz@gnu.org>
>> >
>> > ; Merge from origin/emacs-29
>> >
>> > The following commit was skipped:
>> >
>> > 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
>>
>> Because of this, the typo stills exists on master. Is this due to my
>> having mistakenly committed the change to master and then reverting it
>> and committing it to emacs-29?
>
> I guess so, yes.
I wonder how this happened; I didn't mark the commit for skipping as per
gitmerge.el.
>> Does it now have to be manually installed to master as well?
>
> Yes, please.
Done.
Steve Berman
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
2024-01-13 17:12 ` Stephen Berman
@ 2024-01-13 17:32 ` Eli Zaretskii
0 siblings, 0 replies; 4+ messages in thread
From: Eli Zaretskii @ 2024-01-13 17:32 UTC (permalink / raw)
To: Stephen Berman; +Cc: emacs-devel
> From: Stephen Berman <stephen.berman@gmx.net>
> Cc: emacs-devel@gnu.org
> Date: Sat, 13 Jan 2024 18:12:28 +0100
>
> On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>
> >> > The following commit was skipped:
> >> >
> >> > 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
> >>
> >> Because of this, the typo stills exists on master. Is this due to my
> >> having mistakenly committed the change to master and then reverting it
> >> and committing it to emacs-29?
> >
> > I guess so, yes.
>
> I wonder how this happened; I didn't mark the commit for skipping as per
> gitmerge.el.
I guess some subtle bug in gitmerge.el's algorithms.
> >> Does it now have to be manually installed to master as well?
> >
> > Yes, please.
>
> Done.
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-13 17:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <170514226115.19096.4951628921236684038@vcs2.savannah.gnu.org>
[not found] ` <20240113103754.667A6C00227@vcs2.savannah.gnu.org>
2024-01-13 16:39 ` master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29 Stephen Berman
2024-01-13 16:59 ` Eli Zaretskii
2024-01-13 17:12 ` Stephen Berman
2024-01-13 17:32 ` Eli Zaretskii
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).