Re: Merging emacs-23 into trunk

[Óscar Fuentes]

Stefan Monnier <address@hidden> writes:

>> Yes, when A (or its parent) already is on the target branch with the
>> same revision-id as it has on the source branch.
>
> Which is exactly the situation I was talking about:
>
>     And indeed
>        bzr merge -r A..B
>     will correctly track the history in the case where A has already been
>     merged and committed.

"merge -r A..B" usually means a cherry-pick, because for the case when
it is a merge there is no reason to specify A (the tool figures it out
automatically) but it seems that you missed the syntax "merge -r B"