From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: Emacs antialiasing in X Date: Mon, 16 Jan 2006 18:45:52 +0900 Message-ID: References: <87fynoeuyg.fsf@boost-consulting.com> <200601160814.k0G8Etc3009367@coolsville.localdomain> Reply-To: snogglethorpe@gmail.com, miles@gnu.org NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1137423666 2555 80.91.229.2 (16 Jan 2006 15:01:06 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Jan 2006 15:01:06 +0000 (UTC) Cc: David Abrahams , Kenichi Handa , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 16:01:01 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 1EyVqW-0001ZA-Ae for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 16:00:39 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyVjX-0000GX-Sa for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 09:53:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EySnT-00058n-JV for emacs-devel@gnu.org; Mon, 16 Jan 2006 06:45:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EyRGa-0007AO-8t for emacs-devel@gnu.org; Mon, 16 Jan 2006 05:07:40 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EyQyF-00066Y-Vz for emacs-devel@gnu.org; Mon, 16 Jan 2006 04:48:19 -0500 Original-Received: from [66.249.92.205] (helo=uproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyR1k-0000Uv-03 for emacs-devel@gnu.org; Mon, 16 Jan 2006 04:51:52 -0500 Original-Received: by uproxy.gmail.com with SMTP id u2so717900uge for ; Mon, 16 Jan 2006 01:45:52 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=PSAyrJmnTyujN68HuXv7jIIB+1X424Im47nIl3+DVA3LrL3CoReKR5NTiZvtm11FiyYfnfPzvaID6BEb+EzirMkEpSPlfbWDIvsyXmRX1G3RfCez52N0D/mLkpFugpCissoDSR8EKybh8yF5e8rJSEhqVyM1LhQx4CtSKsvIx8I= Original-Received: by 10.48.220.12 with SMTP id s12mr228462nfg; Mon, 16 Jan 2006 01:45:52 -0800 (PST) Original-Received: by 10.48.3.20 with HTTP; Mon, 16 Jan 2006 01:45:52 -0800 (PST) Original-To: "Jan D." In-Reply-To: <200601160814.k0G8Etc3009367@coolsville.localdomain> Content-Disposition: inline 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:49167 Archived-At: 2006/1/16, Jan D. : > > Are you telling me that edits made to ChangeLog, NEWS, etc., in the > > XFT branch are expendable? > > Kenichi Handa:s suggestion about separate files is a good one. Yes, giving all "high conflict" files like ChangeLog etc. branch-specific names is a good idea, and neatly avoids the most common (and annoying) cause of merge conflicts. I do it on my personal branches too. -Miles -- Do not taunt Happy Fun Ball.