From owner-cvs-src@FreeBSD.ORG Wed Feb 2 13:42:35 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CDD616A4CE; Wed, 2 Feb 2005 13:42:35 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA9543D31; Wed, 2 Feb 2005 13:42:34 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j12DgTmc071718; Wed, 2 Feb 2005 15:42:29 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 23432-07; Wed, 2 Feb 2005 15:42:28 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j12DgSTG071715 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 2 Feb 2005 15:42:28 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id j12DgYqp039824; Wed, 2 Feb 2005 15:42:34 +0200 (EET) (envelope-from ru) Date: Wed, 2 Feb 2005 15:42:33 +0200 From: Ruslan Ermilov To: Dag-Erling Sm?rgrav Message-ID: <20050202134233.GA39750@ip.net.ua> References: <200502021024.j12AOCss028947@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9jxsPFA5p3P2qPhR" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/games/fortune/datfiles fortunes X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Feb 2005 13:42:35 -0000 --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 02, 2005 at 02:16:40PM +0100, Dag-Erling Sm?rgrav wrote: > Ruslan Ermilov writes: > > Modified files: > > games/fortune/datfiles fortunes=20 > > Log: > > Removed 1695 fortunes also found in fortunes2. >=20 > I'd vote for simply merging the two. >=20 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. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --9jxsPFA5p3P2qPhR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFCANjJqRfpzJluFF4RAl3+AJ98MxaJX9KhQffwCpQ4wZJgrXaokQCePAiC 40QZBXVsYrd9aayElaXWaa4= =vPNu -----END PGP SIGNATURE----- --9jxsPFA5p3P2qPhR--