From owner-freebsd-stable@FreeBSD.ORG  Thu Mar 12 08:10:03 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACF441065675;
	Thu, 12 Mar 2009 08:10:03 +0000 (UTC)
	(envelope-from eugen@kuzbass.ru)
Received: from www.svzserv.kemerovo.su (www.svzserv.kemerovo.su
	[213.184.65.80])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FF678FC24;
	Thu, 12 Mar 2009 08:10:02 +0000 (UTC)
	(envelope-from eugen@kuzbass.ru)
Received: from www.svzserv.kemerovo.su (eugen@localhost [127.0.0.1])
	by www.svzserv.kemerovo.su (8.13.8/8.13.8) with ESMTP id n2C7U35E082164;
	Thu, 12 Mar 2009 14:30:03 +0700 (KRAT)
	(envelope-from eugen@www.svzserv.kemerovo.su)
Received: (from eugen@localhost)
	by www.svzserv.kemerovo.su (8.13.8/8.13.8/Submit) id n2C7U3jW082163;
	Thu, 12 Mar 2009 14:30:03 +0700 (KRAT) (envelope-from eugen)
Date: Thu, 12 Mar 2009 14:30:03 +0700
From: Eugene Grosbein <eugen@kuzbass.ru>
To: Doug Barton <dougb@freebsd.org>
Message-ID: <20090312073003.GA81921@svzserv.kemerovo.su>
References: <49B8AB66.9080408@bsd.ee>
	<alpine.BSF.2.00.0903120015420.1054@ync.qbhto.arg>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.BSF.2.00.0903120015420.1054@ync.qbhto.arg>
User-Agent: Mutt/1.4.2.3i
Cc: Andrei Kolu <antik@bsd.ee>, FreeBSD Stable <freebsd-stable@freebsd.org>
Subject: Re: mergemaster annoyance or not?
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Mar 2009 08:10:04 -0000

On Thu, Mar 12, 2009 at 12:22:19AM -0700, Doug Barton wrote:

> What you're seeing is an artifact of the way that CVS deals with cutting a 
> release. Even though the content of the files is the same, the CVS Id is 
> updated in the release branch so that you can track revisions to that file 
> that occur within that branch (e.g., RELENG_6_4), as opposed to the 
> changes that occur in the parent branch (RELENG_6). This is a feature.

I think these days we need (by default) /etc/mergemaster.rc filled in
with something like this:

DIFF_OPTIONS='-I$FreeBSD:.*[$] -I$NetBSD:.*[$]'
IGNORE_FILES='/etc/motd'

Else there is lots of annoyance running mergemaster first time
and after each release and there will be lots of questions/complains
about this.

Eugene Grosbein