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: Tue, 31 Aug 2010 10:54:09 +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 1283219668 21372 80.91.229.12 (31 Aug 2010 01:54:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 01:54:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 03:54:26 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 1OqG3N-0001vI-Q7 for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 03:54:26 +0200 Original-Received: from localhost ([127.0.0.1]:35180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqG3N-0002Yk-BO for ged-emacs-devel@m.gmane.org; Mon, 30 Aug 2010 21:54:25 -0400 Original-Received: from [140.186.70.92] (port=53158 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqG3H-0002YV-6K for emacs-devel@gnu.org; Mon, 30 Aug 2010 21:54:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqG3E-00066i-9k for emacs-devel@gnu.org; Mon, 30 Aug 2010 21:54:19 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:50634) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqG3D-000667-RP for emacs-devel@gnu.org; Mon, 30 Aug 2010 21:54:16 -0400 Original-Received: from rqsmtp1.aist.go.jp (rqsmtp1.aist.go.jp [150.29.254.115]) by mx1.aist.go.jp with ESMTP id o7V1sBfu002524; Tue, 31 Aug 2010 10:54:11 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp1.aist.go.jp by rqsmtp1.aist.go.jp with ESMTP id o7V1sBFg010848; Tue, 31 Aug 2010 10:54:11 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp1.aist.go.jp with ESMTP id o7V1sASQ012008; Tue, 31 Aug 2010 10:54:10 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.71) (envelope-from ) id 1OqG38-0004aI-3B; Tue, 31 Aug 2010 10:54:10 +0900 In-Reply-To: (message from Stefan Monnier on Mon, 30 Aug 2010 18:03:14 +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:129471 Archived-At: In article , Stefan Monnier writes: > > I'm going to fix the display-table related problem in > > emacs-23 branch. But, the diff of the change will > conflict > with the trunk code. As I'm afraid that it's > not a simple > work to resolve that confliction, I want to > apply the same > change to the trunk code by myself. > It's basically easy: > cd .../trunk > bzr merge .../emacs-23 > > cd .../emacs-23 > > bzr commit -m ... > cd .../trunk > bzr merge .../emacs-23 > bzr revert . > > bzr commit -m "Merge by hand from emacs-23"> Thank you for the detailed procedure, but I'm not working directly in emacs-23 and trunk branches but in "Task Branches". I have these branches: trunk -- bound to upstream emacs-23 -- bound to upstream work -- made by "bzr branch trunk work" work-23 -- made by "bzr branch emacs-23 work-23" And, this is my workflow for Emacs 23: A % cd work-23 % bzr commit -m 'my change' % cd ../emacs-23 B % bzr up % bzr commit -m 'merge emacs-23' % cd ../emacs-23 C % bzr merge ../work-23 % bzr commit -m 'my change' 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" Does this surely records that the trunk already took in my change for emacs-23? I think that's necessary to avoid future double merging. --- Kenichi Handa handa@m17n.org