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 10:43:18 +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 1283249854 20840 80.91.229.12 (31 Aug 2010 10:17:34 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 10:17:34 +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 12:17:27 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 1OqNu4-0004QH-M9 for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 12:17:20 +0200 Original-Received: from localhost ([127.0.0.1]:38011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqNsB-0001FJ-BE for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 06:15:23 -0400 Original-Received: from [140.186.70.92] (port=54773 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqNqr-0000Vm-S9 for emacs-devel@gnu.org; Tue, 31 Aug 2010 06:14:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqNqr-0002ql-2K for emacs-devel@gnu.org; Tue, 31 Aug 2010 06:14:01 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:58593) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqNqq-0002qO-VX for emacs-devel@gnu.org; Tue, 31 Aug 2010 06:14:01 -0400 Original-Received: from ceviche.home (vpn-132-204-232-70.acd.umontreal.ca [132.204.232.70]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id o7VADvR8028174; Tue, 31 Aug 2010 06:13:58 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id DABC0660E9; Tue, 31 Aug 2010 12:13:56 +0200 (CEST) In-Reply-To: (Kenichi Handa's message of "Tue, 31 Aug 2010 10:54:09 +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:129489 Archived-At: > So to apply your procedure in the above model, what I should > do is this, right? > A % cd work-23 > > % bzr commit -m 'my change' > % cd ../emacs-23 > B % bzr up > > C % bzr merge ../work-23 > % bzr commit -m 'my change' > % cd ../work > % bzr merge ../emacs-23 > > % bzr commit -m "Merge by hand from emacs-23" > % cd ../trunk > % bzr up > > % bzr commit -m "Merge by hand from emacs-23" That looks right, yes, except for a missing "bzr merge ../work" before the last commit. > Does this surely records that the trunk already took in my > change for emacs-23? Yes. > I think that's necessary to avoid future double merging. Indeed. Note that the steps you describe above are the normal steps to do a merge (except they go through many branches rather than going straight from emacs-23 to trunk). The key part of my suggestion was to use "bzr revert ." followed by applying the change by hand, rather than resoling the conflicts, since I thought that's what you asked. Stefan