From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: synchronizing emacs-unicode branch to HEAD Date: 10 Sep 2003 11:25:54 +0900 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <200309082332.IAA27881@etlken.m17n.org> <20030909203229.GA28335@fencepost> <200309100115.KAA00628@etlken.m17n.org> Reply-To: Miles Bader NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1063160968 5922 80.91.224.253 (10 Sep 2003 02:29:28 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 10 Sep 2003 02:29:28 +0000 (UTC) Cc: d.love@dl.ac.uk, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed Sep 10 04:29:26 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19wujW-0004vJ-00 for ; Wed, 10 Sep 2003 04:29:26 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19wujh-0007j7-00 for ; Wed, 10 Sep 2003 04:29:37 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.22) id 19wujR-00031F-FC for emacs-devel@quimby.gnus.org; Tue, 09 Sep 2003 22:29:21 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.22) id 19wuhU-0000QM-Of for emacs-devel@gnu.org; Tue, 09 Sep 2003 22:27:20 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.22) id 19wuhI-00008H-8K for emacs-devel@gnu.org; Tue, 09 Sep 2003 22:27:09 -0400 Original-Received: from [199.232.41.8] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.22) id 19wugz-00070R-U1; Tue, 09 Sep 2003 22:26:50 -0400 Original-Received: from [210.143.35.52] (helo=TYO202.gate.nec.co.jp) by mx20.gnu.org with esmtp (Exim 4.22) id 19wugL-00079G-OI; Tue, 09 Sep 2003 22:26:09 -0400 Original-Received: from mailgate3.nec.co.jp (mailgate53.nec.co.jp [10.7.69.192]) by TYO202.gate.nec.co.jp (8.11.6/3.7W01080315) with ESMTP id h8A2PvM11164; Wed, 10 Sep 2003 11:25:57 +0900 (JST) Original-Received: from mailsv5.nec.co.jp (mailgate51.nec.co.jp [10.7.69.196]) by mailgate3.nec.co.jp (8.11.6/3.7W-MAILGATE-NEC) with ESMTP id h8A2PvT20640; Wed, 10 Sep 2003 11:25:57 +0900 (JST) Original-Received: from edtmg05.lsi.nec.co.jp ([10.26.17.202]) by mailsv5.nec.co.jp (8.11.7/3.7W-MAILSV-NEC) with ESMTP id h8A2PuS23052; Wed, 10 Sep 2003 11:25:56 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp (localhost [127.0.0.1]) by edtmg05.lsi.nec.co.jp (8.9.3p2+3.2W/3.7W_EDC_Ver.1.0) with ESMTP id LAA18373; Wed, 10 Sep 2003 11:25:56 +0900 (JST) Original-Received: from mcspd15.ucom.lsi.nec.co.jp (mcspd15 [10.30.114.174]) by mcsss2.ucom.lsi.nec.co.jp (8.12.9/8.12.8/EDcg v2.01-mc/1046780839) with ESMTP id h8A2Psbo015259; Wed, 10 Sep 2003 11:25:55 +0900 (JST) Original-Received: by mcspd15.ucom.lsi.nec.co.jp (Postfix, from userid 31295) id A011637F9; Wed, 10 Sep 2003 11:25:54 +0900 (JST) Original-To: Kenichi Handa System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <200309100115.KAA00628@etlken.m17n.org> Original-Lines: 28 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:16255 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:16255 Kenichi Handa writes: > So, if your change depends on macros in old charset.h and coding.h, > you must pay big attention to the change. Otherwise, I think you > don't have to worry about the unicode merge that much. Cool. > > I suppose you probably merged from HEAD too early to get my > > arch-tagging changes; would you mind if I make that same change to > > your CVS unicode branch? > > I don't mind as far as that change doesn't make future merging of > emacs-unicode-2 into HEAD difficult. If I make changes to the unicode branch which I've also made to HEAD, then there will be be redundant hunks. In general I think CVS silently ignores redundant changes (and the tagline changes are pretty well isolated at the end of files), so this shouldn't cause any problems, but I'm not entirely sure about the the specific case of `cvs update -j' (which is what I presume you'll use to do the merge); does anyone know for sure? Thanks -Miles -- Next to fried food, the South has suffered most from oratory. -- Walter Hines Page