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: Wed, 01 Sep 2010 09:01:33 +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 1283324519 11884 80.91.229.12 (1 Sep 2010 07:01:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Sep 2010 07:01:59 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 01 09:01:56 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 1OqhKV-0000ea-4z for ged-emacs-devel@m.gmane.org; Wed, 01 Sep 2010 09:01:55 +0200 Original-Received: from localhost ([127.0.0.1]:43455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqhKT-0002uD-Sy for ged-emacs-devel@m.gmane.org; Wed, 01 Sep 2010 03:01:54 -0400 Original-Received: from [140.186.70.92] (port=37253 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqhKG-0002tp-Iy for emacs-devel@gnu.org; Wed, 01 Sep 2010 03:01:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqhKB-0006d6-La for emacs-devel@gnu.org; Wed, 01 Sep 2010 03:01:40 -0400 Original-Received: from impaqm5.telefonica.net ([213.4.138.5]:53154) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqhKB-0006cs-E1 for emacs-devel@gnu.org; Wed, 01 Sep 2010 03:01:35 -0400 Original-Received: from IMPmailhost5.adm.correo ([10.20.102.126]) by IMPaqm5.telefonica.net with bizsmtp id 1J0T1f00H2jdgqJ3RK1azT; Wed, 01 Sep 2010 09:01:34 +0200 Original-Received: from ceviche.home ([83.40.7.141]) by IMPmailhost5.adm.correo with BIZ IMP id 1K1Z1f00432ZxvX1lK1Zqx; Wed, 01 Sep 2010 09:01:34 +0200 X-Brightmail-Tracker: AAAAAA== X-TE-authinfo: authemail="monnier$movistar.es" |auth_email="monnier@movistar.es" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" Original-Received: by ceviche.home (Postfix, from userid 20848) id 4F462660DF; Wed, 1 Sep 2010 09:01:33 +0200 (CEST) In-Reply-To: (Kenichi Handa's message of "Wed, 01 Sep 2010 09:32:03 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:129539 Archived-At: >> so as to first merge other "pending" changes. > But, I didn't want to merge other "pending" changes. You have to merge them before you merge yours, otherwise Bzr doesn't know how to track the merge history (as mentioned elsewhere, it (like most other VCS, except for DaRCS and maybe Arch) doesn't know how to track cherry-picks). > 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"? Yes. Stefan