From owner-freebsd-current@FreeBSD.ORG Wed Jun 13 18:57:35 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 D52D816A41F for ; Wed, 13 Jun 2007 18:57:35 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from mail-out3.apple.com (mail-out3.apple.com [17.254.13.22]) by mx1.freebsd.org (Postfix) with ESMTP id BF85A13C487 for ; Wed, 13 Jun 2007 18:57:35 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from relay5.apple.com (relay5.apple.com [17.128.113.35]) by mail-out3.apple.com (Postfix) with ESMTP id B8C938BF9A3; Wed, 13 Jun 2007 11:56:27 -0700 (PDT) Received: from relay5.apple.com (unknown [127.0.0.1]) by relay5.apple.com (Symantec Mail Security) with ESMTP id 702E329C003; Wed, 13 Jun 2007 11:57:35 -0700 (PDT) X-AuditID: 11807123-9f821bb000000a23-37-46703e1f7927 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 relay5.apple.com (Apple SCV relay) with ESMTP id 5D9D030400B; Wed, 13 Jun 2007 11:57:35 -0700 (PDT) In-Reply-To: <466FB481.3090503@delphij.net> References: <466FB481.3090503@delphij.net> Mime-Version: 1.0 (Apple Message framework v752.2) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> Content-Transfer-Encoding: 7bit From: Chuck Swiger Date: Wed, 13 Jun 2007 11:57:34 -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: Wed, 13 Jun 2007 18:57:36 -0000 On Jun 13, 2007, at 2:10 AM, LI Xin wrote: > I have done a first cut of bringing latest GNU diffutils (2.8.1) to > the > FreeBSD base system. This consists two parts of changes: > [ ... ] > Some notes: > - I have tried to keep as most our local features (DIFF_OPTIONS, > etc), > but we still need to have some test cases to figure out whether > there is > regression. > - Local changes are now maintained as patchsets. > - Still need to find a better way to handle local manpage changes... > > Comments? Thanks for looking into updating diffutils, Xin. 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, v2.8.6 also includes a fix for invoking an editor in sdiff mode: Paul Eggert wrote: > Chuck Swiger writes: >> At least with diff-2.7 or thereabouts, invoking the >> external editor via "e l" or "e r" would always fail and return the >> warning from this line of diff code: >> >> fatal ("Subsidiary editor failed"); > > You can double-check, but I think that bug was fixed here: > > 2004-04-12 Paul Eggert > > * NEWS, configure.ac (AC_INIT): Version 2.8.6. > ... > * src/sdiff.c (check_child_status): Renamed from ck_editor_status, > and > accept a new arg MAX_OK_STATUS. All callers changed. > Handle status 126/127 as per POSIX. > ------ > Good point, thanks. I installed this: > > 2007-06-06 Paul Eggert > > * NEWS: Mention new sdiff aliases 1 and 2 for l and r. > * doc/diff.texi (Merge Commands): Likewise. > * src/sdiff.c (give_help): Give help for them. > (edit): Support them. > > Index: NEWS > =================================================================== > RCS file: /cvsroot/diffutils/diffutils/NEWS,v > retrieving revision 1.25 > diff -u -p -r1.25 NEWS > --- NEWS 5 Sep 2006 23:02:32 -0000 1.25 > +++ NEWS 6 Jun 2007 23:40:12 -0000 > @@ -14,6 +14,8 @@ User-visible changes since 2.8.7 (in "ve > "Utility Syntax Guidelines" in the Minutes of the January 2005 > Meeting . > > +* sdiff now understands '1' and '2' as synonyms for 'l' and 'r'. > + > Version 2.8.7 contains no user-visible changes. -- -Chuck