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 11:31:52 -0500 Message-ID: <87y81gb0cn.fsf@boost-consulting.com> References: <200601161353.k0GDrZBx010466@coolsville.localdomain> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1137438637 8775 80.91.229.2 (16 Jan 2006 19:10:37 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 19:10:37 +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 20:10:31 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 1EyZjx-0002bN-GG for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 20:10:05 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyZmF-0008IS-Pu for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 14:12:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EyXd1-0005Tv-F1 for emacs-devel@gnu.org; Mon, 16 Jan 2006 11:54:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyXQI-0002Bx-UG for emacs-devel@gnu.org; Mon, 16 Jan 2006 11:41:39 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyXK1-0000hA-7w for emacs-devel@gnu.org; Mon, 16 Jan 2006 11:35:10 -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 1EyXNY-0002vc-Fz for emacs-devel@gnu.org; Mon, 16 Jan 2006 11:38: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 11:32:43 -0500 X-IronPort-AV: i="3.99,372,1131339600"; d="scan'208"; a="195519343:sNHT1883047684" Original-To: "Jan D." In-Reply-To: <200601161353.k0GDrZBx010466@coolsville.localdomain> (Jan D.'s message of "Mon, 16 Jan 2006 14:53:35 +0100 (CET)") 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:49181 Archived-At: "Jan D." writes: >> "Jan D." writes: >> >> >> Are you telling me that edits made to ChangeLog, NEWS, etc., in the >> >> XFT branch are expendable? >> > >> > Yes, because those files have not been changed. >> >> I don't mean to be difficult, but I think "CVS merge" disagrees with >> you. If they had not been changed at all, wouldn't it leave them >> untouched when I merge the XFT branch into the unicode-2 branch? > > One would think so. However, when I merge stuff from HEAD to the XFT > branch, If you've been doing that, it explains everything. > I get conflicts in files I know I have not modified. Probably some > merge expert can explain why that happens. 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. -- Dave Abrahams Boost Consulting www.boost-consulting.com