From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs-23 branch and the trunk Date: Thu, 02 Sep 2010 14:33:42 +0900 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1283405648 30196 80.91.229.12 (2 Sep 2010 05:34:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 2 Sep 2010 05:34:08 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 02 07:34:07 2010 Return-path: 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 ) id 1Or2R3-0002LH-3R for ged-emacs-devel@m.gmane.org; Thu, 02 Sep 2010 07:34:05 +0200 Original-Received: from localhost ([127.0.0.1]:40913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Or2R1-0006n0-W4 for ged-emacs-devel@m.gmane.org; Thu, 02 Sep 2010 01:34:04 -0400 Original-Received: from [140.186.70.92] (port=60353 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Or2Qr-0006l5-T6 for emacs-devel@gnu.org; Thu, 02 Sep 2010 01:33:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Or2Qp-0004YF-TH for emacs-devel@gnu.org; Thu, 02 Sep 2010 01:33:53 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:36311) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Or2Ql-0004XB-HX; Thu, 02 Sep 2010 01:33:48 -0400 Original-Received: from rqsmtp1.aist.go.jp (rqsmtp1.aist.go.jp [150.29.254.115]) by mx1.aist.go.jp with ESMTP id o825XhNh002418; Thu, 2 Sep 2010 14:33:43 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp3.aist.go.jp by rqsmtp1.aist.go.jp with ESMTP id o825XhiT019376; Thu, 2 Sep 2010 14:33:43 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp3.aist.go.jp with ESMTP id o825Xh6T003759; Thu, 2 Sep 2010 14:33:43 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.71) (envelope-from ) id 1Or2Qh-0004ZF-4n; Thu, 02 Sep 2010 14:33:43 +0900 In-Reply-To: (message from Eli Zaretskii on Thu, 02 Sep 2010 01:07:22 -0400) X-detected-operating-system: by eggs.gnu.org: Solaris 9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:129574 Archived-At: In article , Eli Zaretskii writes: > 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. Thank you. "bzr merge --remember ../trunk" worked. --- Kenichi Handa handa@m17n.org