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: Mon, 30 Aug 2010 18:03:14 +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 1283185077 13439 80.91.229.12 (30 Aug 2010 16:17:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Aug 2010 16:17:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 30 18:17:54 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 1Oq73O-00086h-Mq for ged-emacs-devel@m.gmane.org; Mon, 30 Aug 2010 18:17:52 +0200 Original-Received: from localhost ([127.0.0.1]:46073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq6yc-00011d-0Z for ged-emacs-devel@m.gmane.org; Mon, 30 Aug 2010 12:12:54 -0400 Original-Received: from [140.186.70.92] (port=53180 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq6pK-0005OZ-Qk for emacs-devel@gnu.org; Mon, 30 Aug 2010 12:03:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq6pJ-0008He-Hs for emacs-devel@gnu.org; Mon, 30 Aug 2010 12:03:18 -0400 Original-Received: from impaqm5.telefonica.net ([213.4.138.5]:65338) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq6pJ-0008HL-Bf for emacs-devel@gnu.org; Mon, 30 Aug 2010 12:03:17 -0400 Original-Received: from IMPmailhost6.adm.correo ([10.20.102.127]) by IMPaqm5.telefonica.net with bizsmtp id 0b3N1f00K2kvMAa3Rg3FKL; Mon, 30 Aug 2010 18:03:15 +0200 Original-Received: from ceviche.home ([217.126.152.201]) by IMPmailhost6.adm.correo with BIZ IMP id 0g3E1f00L4LyPzM1mg3FTo; Mon, 30 Aug 2010 18:03:15 +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 ECAE0660DF; Mon, 30 Aug 2010 18:03:14 +0200 (CEST) In-Reply-To: (Kenichi Handa's message of "Mon, 30 Aug 2010 17:20:41 +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:129427 Archived-At: > 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" The first part just updates the trunk w.r.t emacs-23 so that when you do the "bzr merge" after installing your change, you only get your own change, rather than a bunch of others. Note that rather than bzr revert . you may want to check the conflict that Bzr gives you: it may turn out to be just as easy to resolve it by hand than to undo&redo. Stefan