[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Latest merge from the emacs-23 branch
|
From: |
Andreas Schwab |
|
Subject: |
Re: Latest merge from the emacs-23 branch |
|
Date: |
Fri, 17 Dec 2010 19:19:30 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2.91 (gnu/linux) |
Eli Zaretskii <address@hidden> 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, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."