Re: Changes to emacs-23 branch and the trunk

[Eli Zaretskii]

> From: Kenichi Handa <address@hidden>
> Date: Thu, 02 Sep 2010 11:49:19 +0900
> Cc: address@hidden
> 
> 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?

I think the next time you merge with the trunk, the remembered parent
location will be reset to the trunk.  If you want to be sure, you
could use the --remember option to "bzr merge":

   cd work && bzr merge --remember ../trunk

or something similar.