From owner-freebsd-current@FreeBSD.ORG Thu Jun 14 08:34:14 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2813616A46B for ; Thu, 14 Jun 2007 08:34:14 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id CEFD713C483 for ; Thu, 14 Jun 2007 08:34:13 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 58692EB9387; Thu, 14 Jun 2007 16:34:07 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id bgSYDJxWowro; Thu, 14 Jun 2007 16:34:04 +0800 (CST) Received: from LI-Xins-MacBook.local (sina152-194.staff.sina.com.cn [61.135.152.194]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id 2957AEB0C7D; Thu, 14 Jun 2007 16:34:04 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:organization:user-agent:mime-version:to:cc: subject:references:in-reply-to:x-enigmail-version:content-type; b=rXPUWzacJIL/9g+Q3WB2Y5piVsRQYY+aS0QfQzVfU/OqQjWzhcBENGlIMQuNbAY90 pFNN45KcRxtokupWNVHow== Message-ID: <4670FD71.4070108@delphij.net> Date: Thu, 14 Jun 2007 16:33:53 +0800 From: LI Xin Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326) MIME-Version: 1.0 To: Chuck Swiger References: <466FB481.3090503@delphij.net> <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> In-Reply-To: <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> X-Enigmail-Version: 0.95.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig464FABEB9CD5B57D6047E259" Cc: FreeBSD Current Subject: Re: RFC: diff(1) update X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2007 08:34:14 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig464FABEB9CD5B57D6047E259 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, Chuck, Chuck Swiger wrote: > Paul Eggert, the diffutils maintainer, has recently adopted a patch for= > sdiff which allows using "1" and "2" in addition to "l" and "r", which > is exceptionally useful when people are running mergemaster. Also, dmalone@ has pointed out that to me. Sounds reasonable and I will take it into account in the import. > v2.8.6 also includes a fix for invoking an editor in sdiff mode: [snip] Do you think it's more sensible to just import 2.8.6 or 2.8.7 instead? Or should I pull out the two changesets? Cheers, --=20 Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! --------------enig464FABEB9CD5B57D6047E259 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGcP1yOfuToMruuMARCqhQAJ0ebFSR5tVZCWwmdHZGQBXSbnYGuACdFaCt aVrldWfwTuMWotf1ozf0z5Y= =uFf5 -----END PGP SIGNATURE----- --------------enig464FABEB9CD5B57D6047E259--