From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Changes to emacs-23 branch and the trunk
Date: Thu, 02 Sep 2010 01:07:22 -0400
Message-ID: <E1Or21C-00057g-9a@fencepost.gnu.org>
References: <tl7bp8k3412.fsf@m17n.org> <jwvlj7oks6c.fsf-monnier+emacs@gnu.org>
	<tl78w3n35tq.fsf@m17n.org> <jwvtymbi3d5.fsf-monnier+emacs@gnu.org>
	<tl74oeb2ei3.fsf@m17n.org> <jwv1v9fey05.fsf-monnier+emacs@gnu.org>
	<tl7y6bm1eyk.fsf@m17n.org> <jwvvd6qaqz1.fsf-monnier+emacs@gnu.org>
	<tl7bp8g272o.fsf@m17n.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1283404055 25685 80.91.229.12 (2 Sep 2010 05:07:35 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Thu, 2 Sep 2010 05:07:35 +0000 (UTC)
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
To: Kenichi Handa <handa@m17n.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 02 07:07:33 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Or21M-0000Ij-27
	for ged-emacs-devel@m.gmane.org; Thu, 02 Sep 2010 07:07:32 +0200
Original-Received: from localhost ([127.0.0.1]:56579 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Or21L-0005u7-CE
	for ged-emacs-devel@m.gmane.org; Thu, 02 Sep 2010 01:07:31 -0400
Original-Received: from [199.232.76.173] (port=44478 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Or21F-0005tb-Tk
	for emacs-devel@gnu.org; Thu, 02 Sep 2010 01:07:25 -0400
Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <eliz@gnu.org>) id 1Or21E-0000Ur-1O
	for emacs-devel@gnu.org; Thu, 02 Sep 2010 01:07:25 -0400
Original-Received: from fencepost.gnu.org ([140.186.70.10]:38061)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <eliz@gnu.org>) id 1Or21D-0000Um-Qx
	for emacs-devel@gnu.org; Thu, 02 Sep 2010 01:07:23 -0400
Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <eliz@gnu.org>)
	id 1Or21C-00057g-9a; Thu, 02 Sep 2010 01:07:22 -0400
In-reply-to: <tl7bp8g272o.fsf@m17n.org> (message from Kenichi Handa on Thu, 02
	Sep 2010 11:49:19 +0900)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:129570
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/129570>

> From: Kenichi Handa <handa@m17n.org>
> Date: Thu, 02 Sep 2010 11:49:19 +0900
> Cc: emacs-devel@gnu.org
> 
> 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.