From owner-freebsd-questions@FreeBSD.ORG Sat Nov 13 14:49:52 2010 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEDAC1065697 for ; Sat, 13 Nov 2010 14:49:52 +0000 (UTC) (envelope-from doug@fledge.watson.org) Received: from fledge.watson.org (fledge.watson.org [65.122.17.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8D1188FC14 for ; Sat, 13 Nov 2010 14:49:52 +0000 (UTC) Received: from fledge.watson.org (localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.14.4/8.14.4) with ESMTP id oADEnpXs064158; Sat, 13 Nov 2010 09:49:51 -0500 (EST) (envelope-from doug@fledge.watson.org) Received: from localhost (doug@localhost) by fledge.watson.org (8.14.4/8.14.4/Submit) with ESMTP id oADEno3r064153; Sat, 13 Nov 2010 09:49:51 -0500 (EST) (envelope-from doug@fledge.watson.org) Date: Sat, 13 Nov 2010 09:49:50 -0500 (EST) From: doug To: =?ISO-8859-15?Q?Leon_Me=DFner?= In-Reply-To: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de> Message-ID: References: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (fledge.watson.org [127.0.0.1]); Sat, 13 Nov 2010 09:49:51 -0500 (EST) Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster comparing everything. X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: doug@safeport.com List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2010 14:49:52 -0000 On Fri, 12 Nov 2010, Leon Me?ner wrote: > Hi, > > is there a trick besides using the rcs funktion of mergemaster to get > around having to look at every file in /etc for comparison? > I know there once was a bug in mergemaster but it's closed for a long > time now. > > Example: > > *** Displaying differences between ./etc/periodic/daily/300.calendar > and installed version: > > --- /etc/periodic/daily/300.calendar 2010-07-29 12:54:42.000000000 > +0200 > +++ ./etc/periodic/daily/300.calendar 2010-11-12 17:06:33.000000000 > +0100 > @@ -1,6 +1,6 @@ > #!/bin/sh > # > -# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1.4.1 > 2010/06/14 02:09:06 kensmith Exp $ > +# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1 2009/08/03 > 08:13:06 kensmith Exp $ > # > # `calendar -a' needs to die. Why? Because it's a bad idea, particular > # with networked home directories, but also in general. If you want > # the > > 90% of the differences are just in this cvs? tag lines. This is an > upgrade from 8.1 to -STABLE. > > Greetings, > Leon Check out the man page version 8 with FBSD there are many options. I tossed a script I wrote in favor of the following in /etc/mergemaster.rc: # Automatically install files that do not exist AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed #IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace #DIFF_FLAG="'.Bub'" # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' With apologizes to whoever first posted this, I did not save the name.