Re: Changes to emacs-23 branch and the trunk

[Stefan Monnier]

>> so as to first merge other "pending" changes.
> But, I didn't want to merge other "pending" changes.

You have to merge them before you merge yours, otherwise Bzr doesn't
know how to track the merge history (as mentioned elsewhere, it (like
most other VCS, except for DaRCS and maybe Arch) doesn't know how to
track cherry-picks).

> Anyway, I've already merged them in my working directory
> "work".  What should I do?  May I commit all of them (after
> resolving conflicts) to the trunk at once with the commit
> message something like "merge changes in emacs-23 branches"?

Yes.


        Stefan