Re: Changes to emacs-23 branch and the trunk

[Stefan Monnier]

> This is strange.  The above step apparently merged more than
> what I committed in emacs-23 branch.  That commit was done
> as this just before the above merge:

Yes, "bzr merge" will merge all the changes from the upstream branch
that haven't been merged yet.  I.e. your command merged all the changes
that had been applied to `emacs-23' but hadn't yet been merged to
`trunk' (or `work').  That's why my original scenario started with:

    cd .../trunk
    bzr merge .../emacs-23
    <resolve&commit>

so as to first merge other "pending" changes.


        Stefan