Re: Confusing "bzr log" as result of merges

[Sven Joachim]

On 2011-05-21 12:38 +0200, Eli Zaretskii wrote:

>> Date: Sat, 21 May 2011 10:33:09 +0300
>> From: Eli Zaretskii <address@hidden>
>> 
>> What can we do to avoid this confusion as result of merges?  And why
>> was 99634.2.937 merged to the trunk, even though the log message
>> clearly says it's a backport?  If we avoid merging such backported
>> revisions, will this problem go away?
>
> On second thought, maybe it's my fault, in that I merged from trunk to
> emacs-23, instead of just copying the code?

No, you only merged a few revisions which is a cherry-pick and not
recorded as a merge.

> Should we refrain from
> merging from trunk to emacs-23, to avoid such confusion?

Merging individual revisions is fine.

Cheers,
       Sven