Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.

[Eli Zaretskii]

> From: Bill Wohler <address@hidden>
> Date: Tue, 30 Sep 2014 09:23:33 -0700
> Cc: address@hidden
> 
> I did use bzr merge, but I added the -i flag to avoid pulling in other
> people's changes.
> 
>     $ bzr merge -i ../emacs-24/
>     $ bzr ci -m"Merge from emacs-24; up to r117522."
> 
> The man page for bzr merge -i says this:
> 
>   To select only some changes to merge, use "merge -i", which will
>   prompt you to apply each diff hunk and file change, similar to
>   "shelve".
> 
> I had no indication that this would not include the merge information.

Whenever you merge only some of the commits, you are actually
cherry-picking.  And cherry-picking is not tracked in the history DAG
of the VCS, at least not in bzr (and not in git, either).

You should merge without the -i switch, and without manually selecting
revisions to merge.  Then the meta-data will record all the revisions
you merged.  As Stefan says, using "M-x bzrmerge" is an easy way of
doing TRT in these situations (it will also pay attention to revisions
that were marked as "don't merge to trunk").