Re: Changes to emacs-23 branch and the trunk

[Kenichi Handa]

In article <address@hidden>, Stefan Monnier <address@hidden> writes:

>>> 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,

My original hope was to avoid that, but now I understand
that is necessary.

> > 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.

Just done.

By the way, when I do "bzr merge" in "work" directory, now
it tries to merge from emacs-23 branch with this message:

Merging from remembered submit location /usr/local/work/emacs/emacs-23/

Previously it tried to merge from trunk with this message:

Merging from remembered parent location /usr/local/work/emacs/trunk/

How can I recover that behaviour?

---
Kenichi Handa
address@hidden