From owner-cvs-all@FreeBSD.ORG  Wed Feb  2 13:46:20 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8C24716A4CE; Wed,  2 Feb 2005 13:46:20 +0000 (GMT)
Received: from smtp-vbr13.xs4all.nl (smtp-vbr13.xs4all.nl [194.109.24.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EAC0843D4C; Wed,  2 Feb 2005 13:46:19 +0000 (GMT)
	(envelope-from wb@freebie.xs4all.nl)
Received: from freebie.xs4all.nl (freebie.xs4all.nl [213.84.32.253])
	j12DkHgr094048;	Wed, 2 Feb 2005 14:46:17 +0100 (CET)
	(envelope-from wb@freebie.xs4all.nl)
Received: from freebie.xs4all.nl (localhost [127.0.0.1])
	by freebie.xs4all.nl (8.13.1/8.12.9) with ESMTP id j12DkHjH051101;
	Wed, 2 Feb 2005 14:46:17 +0100 (CET)
	(envelope-from wb@freebie.xs4all.nl)
Received: (from wb@localhost)
	by freebie.xs4all.nl (8.13.1/8.13.1/Submit) id j12DkH92051100;
	Wed, 2 Feb 2005 14:46:17 +0100 (CET)
	(envelope-from wb)
Date: Wed, 2 Feb 2005 14:46:17 +0100
From: Wilko Bulte <wb@freebie.xs4all.nl>
To: Ruslan Ermilov <ru@FreeBSD.ORG>
Message-ID: <20050202134617.GA51079@freebie.xs4all.nl>
References: <200502021024.j12AOCss028947@repoman.freebsd.org>
	<xzpzmynje4n.fsf@dwp.des.no> <20050202134233.GA39750@ip.net.ua>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050202134233.GA39750@ip.net.ua>
X-OS: FreeBSD 4.11-RC2
User-Agent: Mutt/1.5.6i
X-Virus-Scanned: by XS4ALL Virus Scanner
cc: Dag-Erling Sm?rgrav <des@des.no>
cc: src-committers@FreeBSD.ORG
cc: cvs-all@FreeBSD.ORG
cc: cvs-src@FreeBSD.ORG
Subject: Re: cvs commit: src/games/fortune/datfiles fortunes
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Feb 2005 13:46:20 -0000

On Wed, Feb 02, 2005 at 03:42:33PM +0200, Ruslan Ermilov wrote..
> On Wed, Feb 02, 2005 at 02:16:40PM +0100, Dag-Erling Sm?rgrav wrote:
> > Ruslan Ermilov <ru@FreeBSD.org> writes:
> > >   Modified files:
> > >     games/fortune/datfiles fortunes 
> > >   Log:
> > >   Removed 1695 fortunes also found in fortunes2.
> > 
> > I'd vote for simply merging the two.
> > 
> How do we want to sort the concatenation?  We can sort
> ignoring the whitespace, punctuation, and case, and only
> considering "word" characters, a-la "sort -d".  I can
> arrange for this easily, but it will kill CVS history of
> the merged "fortunes" file.

Hardly the end of the world in this case.

-- 
Wilko Bulte				wilko@FreeBSD.org