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 01:06:21 +0200 [thread overview]
Message-ID: <83sjxwf18y.fsf@gnu.org> (raw)
In-Reply-To: <jwv8vzoukio.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Fri, 17 Dec 2010 17:03:01 -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?
> 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.
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
and this "merge":
99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frames
is also here:
102619: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frames
E.g., try these two commands:
bzr diff -c99634.2.670
bzr diff -c102637
and you will see 2 different changes that seem to fix the same bug in
two slightly different ways.
Moreover, "bzr log -c99634.2.658" displays this:
revno: 99634.2.658
fixes bug(s): http://debbugs.gnu.org/1077
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: emacs-23
timestamp: Thu 2010-12-09 18:53:17 +0000
message:
Fix bug #1077 with popping new frames from a minibuffer-only frame.
Do NOT merge with trunk!
^^^^^^^^^^^^^^^^^^^^^^^^
Reading such log messages will result in a lot of confusion, I'm
afraid.
next prev parent reply other threads:[~2010-12-17 23:06 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 [this message]
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=83sjxwf18y.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 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.