From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Abrahams Newsgroups: gmane.emacs.devel Subject: Re: Emacs antialiasing in X Date: Sun, 15 Jan 2006 22:02:31 -0500 Message-ID: <87fynoeuyg.fsf@boost-consulting.com> 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 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1137385265 16879 80.91.229.2 (16 Jan 2006 04:21:05 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 04:21:05 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 05:21:02 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 1EyLrT-00040A-Qx for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 05:20:56 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyLtk-0003FX-95 for ged-emacs-devel@m.gmane.org; Sun, 15 Jan 2006 23:23:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyKgk-0007zx-4a for emacs-devel@gnu.org; Sun, 15 Jan 2006 22:05:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyKgi-0007zj-Gt for emacs-devel@gnu.org; Sun, 15 Jan 2006 22:05:45 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyKgi-0007zg-FK for emacs-devel@gnu.org; Sun, 15 Jan 2006 22:05:44 -0500 Original-Received: from [207.172.4.62] (helo=smtp02.mrf.mail.rcn.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyKk9-0007Ld-Jy for emacs-devel@gnu.org; Sun, 15 Jan 2006 22:09:17 -0500 Original-Received: from 209-150-60-201.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO localhost.localdomain.boost-consulting.com) ([209.150.60.201]) by smtp02.mrf.mail.rcn.net with ESMTP; 15 Jan 2006 22:03:21 -0500 X-IronPort-AV: i="3.99,369,1131339600"; d="scan'208"; a="195409941:sNHT4033011228" Original-To: Kenichi Handa In-Reply-To: (Kenichi Handa's message of "Mon, 16 Jan 2006 11:35:03 +0900") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) X-Mailman-Approved-At: Sun, 15 Jan 2006 23:22:39 -0500 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:49158 Archived-At: Kenichi Handa writes: > 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. If nobody merges the plain-old "ChangeLog" files from the current XFT branch into what I'm doing, and my branch is used in lieu of the current XFT branch everything people have done in those files (in some cases this amounts substantial work) will be lost. If nobody cares, I can start new files and drop the old ones on the floor. Are you telling me that edits made to ChangeLog, NEWS, etc., in the XFT branch are expendable? -- Dave Abrahams Boost Consulting www.boost-consulting.com