From owner-freebsd-questions@FreeBSD.ORG  Fri Nov 12 19:20:28 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 6591D1065673
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 19:20:28 +0000 (UTC)
	(envelope-from rfarmer@predatorlabs.net)
Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com
	[209.85.216.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 28CDE8FC1F
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 19:20:27 +0000 (UTC)
Received: by qyk31 with SMTP id 31so340080qyk.13
	for <freebsd-questions@freebsd.org>;
	Fri, 12 Nov 2010 11:20:27 -0800 (PST)
MIME-Version: 1.0
Received: by 10.229.236.194 with SMTP id kl2mr2276858qcb.74.1289589627303;
	Fri, 12 Nov 2010 11:20:27 -0800 (PST)
Received: by 10.220.16.199 with HTTP; Fri, 12 Nov 2010 11:20:27 -0800 (PST)
X-Originating-IP: [128.95.133.113]
In-Reply-To: <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>
	<20101112170447.GC8921@emmi.physik-pool.tu-berlin.de>
Date: Fri, 12 Nov 2010 11:20:27 -0800
Message-ID: <AANLkTikVCLyeB088jaar1xbvEbZXFQmL1T9ZHYFWgfiC@mail.gmail.com>
From: Rob Farmer <rfarmer@predatorlabs.net>
To: =?ISO-8859-1?Q?Leon_Me=DFner?= <l.messner@physik.tu-berlin.de>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
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 <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 19:20:28 -0000

On Fri, Nov 12, 2010 at 09:04, Leon Me=DFner
<l.messner@physik.tu-berlin.de> wrote:
> 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).

The problem is the svn to cvs exporter doesn't properly tag the
existing revisions for releases, but rather checks in a brand new
revision and tags that. So, when you switch branches (such as release
to stable) with CVS, all the $FreeBSD$ tags change, and you get the
false positives in mergemaster.

Using your example (etc/periodic/daily/300.calendar), there is:
1.5.36.1.4.1 for RELENG_8_1
1.5.36.1 for RELENG_8
1.5 for MAIN (current)

There are many more 1.5.x revisions for other branches. These
shouldn't exist - the file hasn't changed since 2000 and 1.5 should
just be tagged with for all releases since then.

--=20
Rob Farmer