From owner-freebsd-current@FreeBSD.ORG Thu Jun 14 16:55:38 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 A449A16A468 for ; Thu, 14 Jun 2007 16:55:38 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from mail-out4.apple.com (mail-out4.apple.com [17.254.13.23]) by mx1.freebsd.org (Postfix) with ESMTP id 8C11913C4B8 for ; Thu, 14 Jun 2007 16:55:38 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from relay7.apple.com (relay7.apple.com [17.128.113.37]) by mail-out4.apple.com (Postfix) with ESMTP id 7118C904622; Thu, 14 Jun 2007 09:55:38 -0700 (PDT) Received: from relay7.apple.com (unknown [127.0.0.1]) by relay7.apple.com (Symantec Mail Security) with ESMTP id 5BEC0300A3; Thu, 14 Jun 2007 09:55:38 -0700 (PDT) X-AuditID: 11807125-a0f66bb000000801-78-4671730a007a Received: from [17.214.13.96] (cswiger1.apple.com [17.214.13.96]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by relay7.apple.com (Apple SCV relay) with ESMTP id 4763D300A1; Thu, 14 Jun 2007 09:55:38 -0700 (PDT) In-Reply-To: <4670FD71.4070108@delphij.net> References: <466FB481.3090503@delphij.net> <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> <4670FD71.4070108@delphij.net> Mime-Version: 1.0 (Apple Message framework v752.2) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <3DB5C61E-8902-4BA0-92C7-1C8D9B768F62@mac.com> Content-Transfer-Encoding: 7bit From: Chuck Swiger Date: Thu, 14 Jun 2007 09:55:37 -0700 To: LI Xin X-Mailer: Apple Mail (2.752.2) X-Brightmail-Tracker: AAAAAA== 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 16:55:38 -0000 On Jun 14, 2007, at 1:33 AM, LI Xin wrote: > 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. Excellent-- thank you so much. :-) >> 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? The diff for the "1"/"2" keys is small and could be pulled out easily and used against 2.8.1; the fixes made in v2.8.6 for the subsidiary editor are more complex. I don't think Paul has pushed out a newer tarball than 2.8.1, so you'd have to pull the newer changes out of CVS (@ Savannah, probably?) one way or the other. Regards, -- -Chuck