From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: "Jan D." <jan.h.d@swipnet.se>
Newsgroups: gmane.emacs.devel
Subject: Re: Emacs antialiasing in X
Date: Mon, 16 Jan 2006 20:04:06 +0100
Message-ID: <0764532B-549F-4BB4-985E-9B93D89BB403@swipnet.se>
References: <200601161353.k0GDrZBx010466@coolsville.localdomain>
	<87y81gb0cn.fsf@boost-consulting.com>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0 (Apple Message framework v746.2)
Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed
Content-Transfer-Encoding: 7bit
X-Trace: sea.gmane.org 1137442306 30483 80.91.229.2 (16 Jan 2006 20:11:46 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Mon, 16 Jan 2006 20:11:46 +0000 (UTC)
Cc: emacs-devel@gnu.org, Kenichi Handa <handa@m17n.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 16 21:11:44 2006
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 1EyahS-0004MS-3e
	for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 21:11:34 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Eyajk-0000do-QA
	for ged-emacs-devel@m.gmane.org; Mon, 16 Jan 2006 15:13:56 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1EyZgQ-0004v0-4v
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 14:06:26 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1EyZgO-0004rn-Bj
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 14:06:25 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1EyZgO-0004ra-16
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 14:06:24 -0500
Original-Received: from [195.54.107.73] (helo=mxfep02.bredband.com)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1EyZjw-0003KE-45
	for emacs-devel@gnu.org; Mon, 16 Jan 2006 14:10:04 -0500
Original-Received: from coolsville.localdomain ([83.226.180.193] [83.226.180.193])
	by mxfep02.bredband.com with ESMTP id
	<20060116190359.LANG2008.mxfep02.bredband.com@coolsville.localdomain>;
	Mon, 16 Jan 2006 20:03:59 +0100
In-Reply-To: <87y81gb0cn.fsf@boost-consulting.com>
Original-To: David Abrahams <dave@boost-consulting.com>
X-Mailer: Apple Mail (2.746.2)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:49185
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/49185>

>
> 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.

	Jan D.