From owner-freebsd-stable Thu Oct 8 11:40:43 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA20900 for freebsd-stable-outgoing; Thu, 8 Oct 1998 11:40:43 -0700 (PDT) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from dt053nb4.san.rr.com (dt053nb4.san.rr.com [204.210.34.180]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA20879 for ; Thu, 8 Oct 1998 11:40:29 -0700 (PDT) (envelope-from Studded@dal.net) Received: from dal.net (Studded@localhost [127.0.0.1]) by dt053nb4.san.rr.com (8.8.8/8.8.8) with ESMTP id LAA24444; Thu, 8 Oct 1998 11:40:22 -0700 (PDT) (envelope-from Studded@dal.net) Message-ID: <361D0715.81EEE28C@dal.net> Date: Thu, 08 Oct 1998 11:40:21 -0700 From: Studded Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.5b2 [en] (X11; I; FreeBSD 2.2.7-STABLE-0929 i386) X-Accept-Language: en MIME-Version: 1.0 To: Jeff Kletsky CC: freebsd-stable@FreeBSD.ORG Subject: Re: Recommendations on updating /etc for -stable References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Jeff Kletsky wrote: > I am personally partial to something like > > diff -r --exclude=dev --side-by-side --suppress-common-lines > > since not only does it tell me what is there, not there, and changed, but > in the same pass lets me know *how* it has changed so I can make the edits. I use a similar method in my mergemaster script, except I use sdiff which is even easier. You might want to check out the man page. Doug -- *** Chief Operations Officer, DALnet IRC network *** Go PADRES! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message