From: Eli Zaretskii <eliz@gnu.org>
To: Brian Leung <leungbk@posteo.net>
Cc: 59921-done@debbugs.gnu.org, stefankangas@gmail.com
Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits
Date: Sat, 10 Dec 2022 16:22:50 +0200 [thread overview]
Message-ID: <83lenfwd6t.fsf@gnu.org> (raw)
In-Reply-To: <874ju3ebge.fsf@posteo.net> (message from Brian Leung on Sat, 10 Dec 2022 11:36:10 +0000)
> From: Brian Leung <leungbk@posteo.net>
> Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org
> Date: Sat, 10 Dec 2022 11:36:10 +0000
>
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > I've went over all of the above commits, and manually committed
> > changes of those of them which appeared to be missing from the
> > master
> > branch.
> >
> > I have no idea how this happened. I guess we have some subtle
> > bug in
> > gitmerge.el, perhaps triggered by the situations like the one at
> > that
> > merge, where a feature branch which was not forked from our Git
> > repository was merged piecemeal into the release branch.
>
> Thanks for looking into this. I think we can close this now,
> though I'm not sure how to do so here on debbugs.
Like I did now (look at the addresses).
prev parent reply other threads:[~2022-12-10 14:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 10:17 bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Brian Leung
2022-12-09 10:46 ` Brian Leung
2022-12-09 11:13 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-09 12:01 ` Brian Leung
2022-12-09 12:28 ` Stefan Kangas
2022-12-09 12:43 ` Brian Leung
2022-12-09 15:54 ` Eli Zaretskii
2022-12-09 21:08 ` Brian Leung
2022-12-10 7:22 ` Eli Zaretskii
2022-12-10 0:43 ` Brian Leung
2022-12-10 7:52 ` Eli Zaretskii
2022-12-10 11:30 ` Eli Zaretskii
2022-12-10 11:36 ` Brian Leung
2022-12-10 14:22 ` Eli Zaretskii [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83lenfwd6t.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=59921-done@debbugs.gnu.org \
--cc=leungbk@posteo.net \
--cc=stefankangas@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.