From owner-freebsd-stable@FreeBSD.ORG Thu Aug 7 18:31:50 2008 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85DC6106567A for ; Thu, 7 Aug 2008 18:31:50 +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 66C218FC12 for ; Thu, 7 Aug 2008 18:31:50 +0000 (UTC) (envelope-from cswiger@mac.com) Received: from relay14.apple.com (relay14.apple.com [17.128.113.52]) by mail-out3.apple.com (Postfix) with ESMTP id 2CB0535B27E8; Thu, 7 Aug 2008 11:31:50 -0700 (PDT) Received: from relay14.apple.com (unknown [127.0.0.1]) by relay14.apple.com (Symantec Mail Security) with ESMTP id 0FDF1280A3; Thu, 7 Aug 2008 11:31:50 -0700 (PDT) X-AuditID: 11807134-a69fabb000000ece-e0-489b3f951c59 Received: from cswiger1.apple.com (cswiger1.apple.com [17.227.140.124]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by relay14.apple.com (Apple SCV relay) with ESMTP id D0DE028089; Thu, 7 Aug 2008 11:31:49 -0700 (PDT) Message-Id: From: Chuck Swiger To: Milan Obuch In-Reply-To: <200808071134.41927.freebsd-stable@dino.sk> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v928.1) Date: Thu, 7 Aug 2008 11:31:49 -0700 References: <1EE0EC59-C48C-4B07-B08E-77BE388BBDE1@develooper.com> <20080807090422.GA19885@eos.sc1.parodius.com> <200808071134.41927.freebsd-stable@dino.sk> X-Mailer: Apple Mail (2.928.1) X-Brightmail-Tracker: AAAAAA== Cc: Jeremy Chadwick , =?ISO-8859-1?Q?Ask_Bj=F8rn_Hansen?= , freebsd-stable@freebsd.org Subject: Re: i386 vs amd64? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2008 18:31:50 -0000 On Aug 7, 2008, at 2:34 AM, Milan Obuch wrote: >> 5) Get familiar with mergemaster, specifically the side-by-side >> interactive diff feature. It looks scary the first time around, >> but once you learn that "r" applies the stuff you see on the right, >> and "l" applies the stuff you see on the left, you should be fine. > > Funny observation: "r" is on LEFT keyboard side, "l" is on RIGHT > keyboard > side. I for one have problem at times precisely for this reason, but > I know > this is an important step and one need to act with great care. Fortunately, the diffutils maintainer has accepted a patch to allow "1" and "2" (similar to http://www.pkix.net/~chuck/sdiff2.diff); hopefully your system is recent enough to include that change: Regards, -- -Chuck Begin forwarded message: > From: Chuck Swiger > Date: June 13, 2007 11:57:34 AM PDT > To: LI Xin > Cc: FreeBSD Current > Subject: Re: RFC: diff(1) update > > 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 > >