From owner-freebsd-questions@FreeBSD.ORG  Fri Nov 12 17:04:50 2010
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
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 129FE106567A
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 17:04:50 +0000 (UTC)
	(envelope-from elon@emmi.physik-pool.tu-berlin.de)
Received: from emmi.physik-pool.tu-berlin.de (emmi.physik-pool.tu-berlin.de
	[130.149.58.146])
	by mx1.freebsd.org (Postfix) with ESMTP id 93A458FC13
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 17:04:49 +0000 (UTC)
Received: from emmi.physik-pool.tu-berlin.de
	(localhost.physik-pool.tu-berlin.de [127.0.0.1])
	by emmi.physik-pool.tu-berlin.de (8.14.4/8.14.4) with ESMTP id
	oACH4mPQ091565; Fri, 12 Nov 2010 18:04:48 +0100 (CET)
	(envelope-from elon@emmi.physik-pool.tu-berlin.de)
Received: (from elon@localhost)
	by emmi.physik-pool.tu-berlin.de (8.14.4/8.14.4/Submit) id
	oACH4lk0091564; Fri, 12 Nov 2010 18:04:47 +0100 (CET)
	(envelope-from elon)
Date: Fri, 12 Nov 2010 18:04:47 +0100
From: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de>
To: Warren Block <wblock@wonkity.com>
Message-ID: <20101112170447.GC8921@emmi.physik-pool.tu-berlin.de>
References: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de>
	<alpine.BSF.2.00.1011120939200.10996@wonkity.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.BSF.2.00.1011120939200.10996@wonkity.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de>,
	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 <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 17:04:50 -0000

On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote:
> 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.

thanks, that helped. Did the default behavior of mergemaster change
somewhere because i didn't have to do this awhile ago (months not
years).

greetings,
Leon