From owner-freebsd-questions@FreeBSD.ORG  Fri Nov 12 16:20:07 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 3109B106566C
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 16:20:07 +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 B0BDF8FC13
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 16:20:06 +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
	oACGK44q086624 for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 17:20:04 +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
	oACGK4fB086623
	for freebsd-questions@freebsd.org; Fri, 12 Nov 2010 17:20:04 +0100 (CET)
	(envelope-from elon)
Date: Fri, 12 Nov 2010 17:20:04 +0100
From: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de>
To: freebsd-questions@freebsd.org
Message-ID: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Subject: 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 16:20:07 -0000

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