From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs-23 branch and the trunk Date: Mon, 30 Aug 2010 10:19:08 -0400 Message-ID: <87occkdvz7.fsf@stupidchicken.com> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1283178643 15369 80.91.229.12 (30 Aug 2010 14:30:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Aug 2010 14:30:43 +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 16:30:37 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 1Oq5NA-0001vn-23 for ged-emacs-devel@m.gmane.org; Mon, 30 Aug 2010 16:30:36 +0200 Original-Received: from localhost ([127.0.0.1]:43433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq5Mo-0003FD-5q for ged-emacs-devel@m.gmane.org; Mon, 30 Aug 2010 10:29:46 -0400 Original-Received: from [140.186.70.92] (port=51282 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq5JF-0000jZ-Jk for emacs-devel@gnu.org; Mon, 30 Aug 2010 10:26:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq5CY-00069I-61 for emacs-devel@gnu.org; Mon, 30 Aug 2010 10:19:11 -0400 Original-Received: from pantheon-po23.its.yale.edu ([130.132.50.117]:54240) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq5CY-00069B-2e for emacs-devel@gnu.org; Mon, 30 Aug 2010 10:19:10 -0400 Original-Received: from furry (adsl-99-89-95-190.dsl.wlfrct.sbcglobal.net [99.89.95.190]) (authenticated bits=0) by pantheon-po23.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o7UEJ9hD026113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 30 Aug 2010 10:19:09 -0400 Original-Received: by furry (Postfix, from userid 1000) id 08D6D16D402; Mon, 30 Aug 2010 10:19:09 -0400 (EDT) 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-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 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:129420 Archived-At: Kenichi Handa 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. Can I do that? What > should I take care other than the usual committing of > changes? If different changes have to be applied to the different branches, just make the changes directly.