From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs-23 branch and the trunk Date: Tue, 31 Aug 2010 15:08:02 +0200 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 1283260113 31776 80.91.229.12 (31 Aug 2010 13:08:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 13:08:33 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 15:08:31 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 1OqQZi-00080g-CM for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 15:08:30 +0200 Original-Received: from localhost ([127.0.0.1]:37835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqQZh-0007hr-BR for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 09:08:29 -0400 Original-Received: from [140.186.70.92] (port=54026 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqQZV-0007bP-4p for emacs-devel@gnu.org; Tue, 31 Aug 2010 09:08:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqQZQ-0004FT-3u for emacs-devel@gnu.org; Tue, 31 Aug 2010 09:08:16 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:52346) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqQZP-0004FJ-WF for emacs-devel@gnu.org; Tue, 31 Aug 2010 09:08:12 -0400 Original-Received: from ceviche.home (vpn-132-204-232-70.acd.umontreal.ca [132.204.232.70]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id o7VD83jT028519; Tue, 31 Aug 2010 09:08:04 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 557CA66121; Tue, 31 Aug 2010 15:08:02 +0200 (CEST) In-Reply-To: (Kenichi Handa's message of "Tue, 31 Aug 2010 20:44:20 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3611=0 X-detected-operating-system: by eggs.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." 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:129498 Archived-At: > 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. Stefan