From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Latest merge from the emacs-23 branch
Date: Sat, 18 Dec 2010 19:37:34 +0200 [thread overview]
Message-ID: <83hbebf0dd.fsf@gnu.org> (raw)
In-Reply-To: <jwvr5dft6x4.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sat, 18 Dec 2010 10:58:14 -0500
>
> >> Cherrypicking is unworkable since it means doing all the
> >> history-tracking by hand.
> > What do you mean by "history-tracking", and why do we need to do it by
> > hand?
>
> By history tracking I mean keeping track of what has been merged where
> and when.
Okay, then how about including with the merge commit message the list
of revisions you backed out after merging? This list cannot be too
long (otherwise merging doesn't make sense). Until now we only had a
laconic "merge from emacs-23" as the log message.
> > No, there actually seem to be 2 different revisions on the trunk now that
> > appear to solve the same issue in two different ways. For example, this
> > "merge":
>
> > 99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs
>
> > is also present here:
>
> > 102637: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs
>
> Yup. This is a non-issue.
It will be a non-issue if there's a way to know that 99634.2.670 was
reverse cherry-picked after merging. Otherwise, how can I distinguish
between this case and the case of erroneously merging from the branch
(which happened in the past)?
next prev parent reply other threads:[~2010-12-18 17:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 16:03 Latest merge from the emacs-23 branch Eli Zaretskii
2010-12-17 18:19 ` Andreas Schwab
2010-12-17 19:22 ` Eli Zaretskii
2010-12-17 22:03 ` Stefan Monnier
2010-12-17 23:06 ` Eli Zaretskii
2010-12-18 15:58 ` Stefan Monnier
2010-12-18 17:37 ` Eli Zaretskii [this message]
2010-12-19 13:47 ` Stefan Monnier
2010-12-19 15:10 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83hbebf0dd.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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 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).