From: Andreas Schwab <schwab@linux-m68k.org>
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 19:19:30 +0100 [thread overview]
Message-ID: <m2r5dgz2h9.fsf@igel.home> (raw)
In-Reply-To: <83zks4fkua.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 17 Dec 2010 18:03:09 +0200")
Eli Zaretskii <eliz@gnu.org> writes:
> 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's the difference between merging and cherry picking.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2010-12-17 18:19 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 [this message]
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
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=m2r5dgz2h9.fsf@igel.home \
--to=schwab@linux-m68k.org \
--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 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).