Re: Merging emacs-23 into trunk

[Stefan Monnier]

>>> You are cherry-picking here; cherry-picking is explicitly not tracked
>>> in the history DAG.
>> Actually, I'm not cherry-picking: Since all changes until A have been
>> merged, merging A..B will end up with all changes until B: I'm not
>> picking some changes and avoiding others.
>> And indeed
>> bzr merge -r A..B
>> will correctly track the history in the case where A has already been
>> merged and committed.

> No. It will keep the order of the commits, but that's is all it does as
> far as the VC history is concerned.

I have no idea what you mean by the above, but I have tried and tested

  bzr merge -r A..B
  
and in all my tests, in the case where A has already been merged into
the current tree, it behaves exactly like

  bzr merge -r B

with respect to history-tracking.


        Stefan