From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Latest merge from the emacs-23 branch
Date: Fri, 17 Dec 2010 17:03:01 -0500 [thread overview]
Message-ID: <jwv8vzoukio.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83zks4fkua.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 17 Dec 2010 18:03:09 +0200")
> The latest merge, which created revision 102642 on the trunk, shows a
> lot of revisions from the branch as merged (to see them, try something
> like "bzr log --line -c102642 -n0"), but at least some of them are not
> actually included in the merge. Here are a few examples:
> 99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs...
> 99634.2.664: Glenn Morris 2010-12-11 [Backport from trunk]: * make-dist: E...
> 99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frame...
> These revisions indeed should not have been merged to the trunk, but
> why do they show in Bazaar's merge log? That will certainly
> complicate future forensics, I think.
Cherrypicking is unworkable since it means doing all the
history-tracking by hand. So the "merge from emacs-23" is *really*
a merge. I'm not sure what you mean by "some of them are not
actually included in the merge", tho. AFAIK they are included in the
sense that the corresponding change is now present on the trunk.
Stefan
next prev parent reply other threads:[~2010-12-17 22:03 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 [this message]
2010-12-17 23:06 ` Eli Zaretskii
2010-12-18 15:58 ` Stefan Monnier
2010-12-18 17:37 ` Eli Zaretskii
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv8vzoukio.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/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.