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: Mon, 16 Jan 2006 15:17:50 -0500 Message-ID: <87zmlw9bbl.fsf@boost-consulting.com> References: <200601161353.k0GDrZBx010466@coolsville.localdomain> <87y81gb0cn.fsf@boost-consulting.com> <0764532B-549F-4BB4-985E-9B93D89BB403@swipnet.se> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1137444347 6300 80.91.229.2 (16 Jan 2006 20:45:47 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 20:45:47 +0000 (UTC) Cc: emacs-devel@gnu.org, Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 21:45:39 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 1EybE2-0004RN-W4 for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 21:45:15 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EybGL-00051s-I9 for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 15:47:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Eyaqj-0004tw-Pj for emacs-devel@gnu.org; Mon, 16 Jan 2006 15:21:09 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Eyaqh-0004t9-OZ for emacs-devel@gnu.org; Mon, 16 Jan 2006 15:21:09 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Eyaqh-0004t0-CL for emacs-devel@gnu.org; Mon, 16 Jan 2006 15:21:07 -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 1EyauG-0003Bd-AU for emacs-devel@gnu.org; Mon, 16 Jan 2006 15:24:48 -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; 16 Jan 2006 15:18:43 -0500 X-IronPort-AV: i="3.99,373,1131339600"; d="scan'208"; a="195584301:sNHT27196948" Original-To: "Jan D." In-Reply-To: <0764532B-549F-4BB4-985E-9B93D89BB403@swipnet.se> (Jan D.'s message of "Mon, 16 Jan 2006 20:04:06 +0100") 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:49186 Archived-At: "Jan D." writes: >> >> Are you keeping a tag on the trunk for the last revision you've merged >> into your branch? If so, >> >> cvs up -jLastMergeTag -jHEAD >> >> should get you an incremental merge with no bogus conflicts. And then >> I could use your LastMergeTag to merge with emacs-unicode-2 with fewer >> conflicts as well. > > 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. -- Dave Abrahams Boost Consulting www.boost-consulting.com