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: Emacs antialiasing in X Date: Mon, 16 Jan 2006 11:35:03 +0900 Message-ID: References: <877j9ya8tu.fsf@boost-consulting.com> <200512220938.jBM9c8Lf021116@coolsville.localdomain> <873bjtoy1i.fsf@boost-consulting.com> <0B2B9218-7271-493B-A60D-F912E09E6E27@swipnet.se> <8764onlsq4.fsf@boost-consulting.com> <87oe2eisl2.fsf@boost-consulting.com> <87irsmkuzh.fsf@emfox.3322.org> <43CA0874.9090706@swipnet.se> <87k6d0exev.fsf@boost-consulting.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: text/plain; charset=US-ASCII X-Trace: sea.gmane.org 1137378950 2952 80.91.229.2 (16 Jan 2006 02:35:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 02:35:50 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 03:35:47 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EyKDd-0000sR-NP for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 03:35:42 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyKFt-0005bP-TB for ged-emacs-devel@m.gmane.org; Sun, 15 Jan 2006 21:38:01 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyKFg-0005bH-MY for emacs-devel@gnu.org; Sun, 15 Jan 2006 21:37:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyKFf-0005b5-Ne for emacs-devel@gnu.org; Sun, 15 Jan 2006 21:37:48 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyKFf-0005b2-IJ for emacs-devel@gnu.org; Sun, 15 Jan 2006 21:37:47 -0500 Original-Received: from [192.47.44.130] (helo=tsukuba.m17n.org) by monty-python.gnu.org with esmtp (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA:24) (Exim 4.34) id 1EyKJ6-0005XS-2V for emacs-devel@gnu.org; Sun, 15 Jan 2006 21:41:20 -0500 Original-Received: from nfs.m17n.org (nfs.m17n.org [192.47.44.7]) by tsukuba.m17n.org (8.13.4/8.13.4/Debian-3) with ESMTP id k0G2Z4Hp016558; Mon, 16 Jan 2006 11:35:04 +0900 Original-Received: from etlken (etlken.m17n.org [192.47.44.125]) by nfs.m17n.org (8.13.4/8.13.4/Debian-3) with ESMTP id k0G2Z4sO008618; Mon, 16 Jan 2006 11:35:04 +0900 Original-Received: from handa by etlken with local (Exim 3.36 #1 (Debian)) id 1EyKD1-0007jt-00; Mon, 16 Jan 2006 11:35:03 +0900 Original-To: David Abrahams In-reply-to: <87k6d0exev.fsf@boost-consulting.com> (message from David Abrahams on Sun, 15 Jan 2006 21:09:28 -0500) User-Agent: SEMI/1.14.3 (Ushinoya) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 Emacs/22.0.50 (i686-pc-linux-gnu) MULE/5.0 (SAKAKI) 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:49153 Archived-At: In article <87k6d0exev.fsf@boost-consulting.com>, David Abrahams writes: >> In emacs-unicode-2, I'm using README.unicode and >> ChangeLog.unicode. NEWS etc. are not yet written. > I appreciate that you're trying to help (really!) but I don't > understand what you're telling me yet. I'm concerned because there > are merge conflicts in the plain "ChangeLog," etc., files. If I am > going to merge the branches I have to resolve those, don't I? I thought you are going to make a new branch, say emacs-unicode-2-xft from the current emacs-unicode-2. Then, what I suggest is to use something like ChangeLog.xft for the changes you are going to made on that new branch. In the future, emacs-unicode-2-xft branch will be merged into emacs-unicode-2, and then emacs-unicode-2 branch will be merged into the main trunk. Or, we may merge emacs-unicode-2 to the main trunk at first, create a new branch emacs-xft from there, merge emacs-unicode-2-xft into emacs-xft, and when emacs-xft gets stable enough, merge it into the main trunk. On those merging, there should be no conflict in ChangeLog if we are using different file names. And after the merge, we can insert ChangeLog.unicode and ChangeLog.xft in ChangeLog. --- Kenichi Handa handa@m17n.org