Re: Confusing "bzr log" as result of merges

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> Eli Zaretskii <address@hidden> writes:
>> 
>> > 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?
>> 
>> A merge always includes all parent revisions.  There is no way to "avoid
>> merging a backported revision".
>
> Maybe with git.  With bzr, "merge" accepts a switch that can specify
> revisions to merge.

When you pass a list of revisions, you aren't doing a merge, but a
cherry pick.  The resulting commit does not record the list of revisions
in any way.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."