From owner-freebsd-questions@FreeBSD.ORG Fri Nov 12 16:40:02 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 BD96A1065670 for ; Fri, 12 Nov 2010 16:40:02 +0000 (UTC) (envelope-from wblock@wonkity.com) Received: from wonkity.com (wonkity.com [67.158.26.137]) by mx1.freebsd.org (Postfix) with ESMTP id 7780B8FC1C for ; Fri, 12 Nov 2010 16:40:02 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.4/8.14.4) with ESMTP id oACGe1SI011011; Fri, 12 Nov 2010 09:40:01 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.4/8.14.4/Submit) with ESMTP id oACGe1WT011008; Fri, 12 Nov 2010 09:40:01 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Fri, 12 Nov 2010 09:40:01 -0700 (MST) From: Warren Block 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.6 (wonkity.com [127.0.0.1]); Fri, 12 Nov 2010 09:40:01 -0700 (MST) Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster comparing everything. X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Nov 2010 16:40:02 -0000 On Fri, 12 Nov 2010, Leon Me?ner wrote: > 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. ... > 90% of the differences are just in this cvs? tag lines. This is an > upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps.