From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: William Xu Newsgroups: gmane.emacs.devel Subject: Re: unicode branch is merged to trunk Date: Sat, 02 Feb 2008 02:55:01 +0900 Organization: the Church of Emacs Message-ID: References: <87myqklknj.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1201888538 28053 80.91.229.12 (1 Feb 2008 17:55:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Feb 2008 17:55:38 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 01 18:55:59 2008 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.50) id 1JL07D-0003Vb-An for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 18:55:51 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JL06l-0008Eo-SE for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 12:55:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JL06h-0008ER-Ow for emacs-devel@gnu.org; Fri, 01 Feb 2008 12:55:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JL06f-0008DC-IK for emacs-devel@gnu.org; Fri, 01 Feb 2008 12:55:18 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JL06f-0008D9-9m for emacs-devel@gnu.org; Fri, 01 Feb 2008 12:55:17 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JL06e-0007UB-LZ for emacs-devel@gnu.org; Fri, 01 Feb 2008 12:55:17 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JL06a-00044K-Sn for emacs-devel@gnu.org; Fri, 01 Feb 2008 17:55:12 +0000 Original-Received: from kd125052252076.ppp-bb.dion.ne.jp ([125.52.252.76]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 01 Feb 2008 17:55:12 +0000 Original-Received: from william.xwl by kd125052252076.ppp-bb.dion.ne.jp with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 01 Feb 2008 17:55:12 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: kd125052252076.ppp-bb.dion.ne.jp User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (darwin) Cancel-Lock: sha1:ZcDDjKeJ6ks5K6QGgFIGfBI8krs= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) 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:87943 Archived-At: Miles Bader writes: > There are two CVS tags bracketing the merge, > "before-merge-unicode-to-trunk", and "merge-unicode-to-trunk". > > The only processing of ChangeLogs I did was to _prepend_ the > ChangeLog.unicode files to the corresponding ChangeLogs, munge the dates in > the ChangeLog entries (to be today), and delete ChangeLog.unicode files. > > I didn't do anything with "etc/NEWS.unicode", as the structure of > "etc/NEWS" seems to be complicated enough that some effort will be required > to merge them. Finally ! I bless i might bootstrap my carbon emacs after the merge... -- William http://williamxu.net9.org