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: Wed, 01 Sep 2010 09:32:03 +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 1283301151 12468 80.91.229.12 (1 Sep 2010 00:32:31 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Sep 2010 00:32:31 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 01 02:32:30 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 1OqbFa-0003FC-Jz for ged-emacs-devel@m.gmane.org; Wed, 01 Sep 2010 02:32:29 +0200 Original-Received: from localhost ([127.0.0.1]:45567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqbFW-0008IW-K0 for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 20:32:22 -0400 Original-Received: from [140.186.70.92] (port=59727 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqbFO-0008FL-OC for emacs-devel@gnu.org; Tue, 31 Aug 2010 20:32:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqbFJ-0003rs-PP for emacs-devel@gnu.org; Tue, 31 Aug 2010 20:32:11 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:57958) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqbFJ-0003rN-9T for emacs-devel@gnu.org; Tue, 31 Aug 2010 20:32:09 -0400 Original-Received: from rqsmtp2.aist.go.jp (rqsmtp2.aist.go.jp [150.29.254.123]) by mx1.aist.go.jp with ESMTP id o810W4K2023419; Wed, 1 Sep 2010 09:32:05 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp2.aist.go.jp by rqsmtp2.aist.go.jp with ESMTP id o810W4iU019032; Wed, 1 Sep 2010 09:32:04 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp2.aist.go.jp with ESMTP id o810W3aE015560; Wed, 1 Sep 2010 09:32:03 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.71) (envelope-from ) id 1OqbFD-00046H-CS; Wed, 01 Sep 2010 09:32:03 +0900 In-Reply-To: (message from Stefan Monnier on Tue, 31 Aug 2010 15:08:02 +0200) 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:129520 Archived-At: In article , Stefan Monnier writes: > > This is strange. The above step apparently merged more than > > what I committed in emacs-23 branch. That commit was done > > as this just before the above merge: > Yes, "bzr merge" will merge all the changes from the upstream branch > that haven't been merged yet. I.e. your command merged all the changes > that had been applied to `emacs-23' but hadn't yet been merged to > `trunk' (or `work'). That's why my original scenario started with: > cd .../trunk > bzr merge .../emacs-23 > > so as to first merge other "pending" changes. But, I didn't want to merge other "pending" changes. 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"? --- Kenichi Handa handa@m17n.org