Re: Latest merge from the emacs-23 branch

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: address@hidden
> 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 <address@hidden>
  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.