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: Tue, 17 Jan 2006 10:19:01 -0500 Message-ID: <87lkxe9922.fsf@boost-consulting.com> References: <200601161353.k0GDrZBx010466@coolsville.localdomain> <87y81gb0cn.fsf@boost-consulting.com> <0764532B-549F-4BB4-985E-9B93D89BB403@swipnet.se> <87zmlw9bbl.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 1137522231 30397 80.91.229.2 (17 Jan 2006 18:23:51 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 17 Jan 2006 18:23:51 +0000 (UTC) Cc: "Jan D." , emacs-devel@gnu.org, Kenichi Handa , miles@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 17 19:23: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 1EyvUe-0002iZ-OU for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2006 19:23:45 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyvU0-0001lf-49 for ged-emacs-devel@m.gmane.org; Tue, 17 Jan 2006 13:23:04 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EytQ1-0003VU-Li for emacs-devel@gnu.org; Tue, 17 Jan 2006 11:10:49 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EytJQ-0001tH-GY for emacs-devel@gnu.org; Tue, 17 Jan 2006 11:04:03 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EysfV-0001af-El for emacs-devel@gnu.org; Tue, 17 Jan 2006 10:22:45 -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 1Eysj6-0008B6-1a; Tue, 17 Jan 2006 10:26:28 -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; 17 Jan 2006 10:19:57 -0500 X-IronPort-AV: i="3.99,376,1131339600"; d="scan'208"; a="195856886:sNHT26012148" Original-To: snogglethorpe@gmail.com In-Reply-To: (Miles Bader's message of "Tue, 17 Jan 2006 07:48:38 +0900") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) 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:49211 Archived-At: Miles Bader writes: > 2006/1/17, David Abrahams : >> > No tag, but you can use the date specifier, the cvs log message gives >> > the date. >> >> Thanks, I'll do that. FWIW, if you do use such tags you can >> substantially reduce the number of conflicts you see upon merging. > > This whole conversation is making me very nervous .... Me too. If I have to learn and install a whole new version control system just to contribute to a project that's actually officially stored in CVS, it raises the barrier to entry considerably. > I also merge into the emacs-unicode-2 branch (using arch), and this is > normally pretty easy. I'm afraid that a botched merge (all too easy > with CVS) into that same branch will make things very painful for me. > > Jan, how many changes are there in the XFT branch, compared to the trunk? > > If it's not many, how about instead I update my XFT branch in arch > (it's out of date because it got merged into from the trunk, which > caused lots of problems for my syncing scripts, but I can just > probably just recreate it from scratch), then merge that into the > unicode branch (using arch), and make a new combined branch, and then > make a new CVS branch from that...? Well :) That's certainly an attractive idea from my point of view! Please do it; I'll be very glad not to have to worry about that step. -- Dave Abrahams Boost Consulting www.boost-consulting.com