From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 07:31:01 2009 Return-Path: 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 216921065673 for ; Thu, 12 Mar 2009 07:31:01 +0000 (UTC) (envelope-from antik@bsd.ee) Received: from sorbesgroup.com (mail.sorbesgroup.com [217.159.241.118]) by mx1.freebsd.org (Postfix) with ESMTP id C88F38FC2C for ; Thu, 12 Mar 2009 07:31:00 +0000 (UTC) (envelope-from antik@bsd.ee) Received: from localhost (localhost.localdomain [127.0.0.1]) by sorbesgroup.com (Postfix) with ESMTP id 15B1B3C530D1; Thu, 12 Mar 2009 09:09:59 +0200 (EET) Received: from sorbesgroup.com ([127.0.0.1]) by localhost (sorbesgroup.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12986-07; Thu, 12 Mar 2009 09:09:58 +0200 (EET) Received: from [192.168.0.80] (andrei [192.168.0.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sorbesgroup.com (Postfix) with ESMTP id ADFC93C530DD; Thu, 12 Mar 2009 09:09:57 +0200 (EET) Message-ID: <49B8BA35.802@bsd.ee> Date: Thu, 12 Mar 2009 09:31:01 +0200 From: Andrei Kolu User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Doug Barton , FreeBSD Stable References: <49B8AB66.9080408@bsd.ee> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at localhost Cc: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 07:31:01 -0000 Doug Barton wrote: > On Thu, 12 Mar 2009, Andrei Kolu wrote: > >> Hello! >> >> As long time FreeBSD user I am concerned about RELEASE and STABLE >> configuration files inconsistency. > > This topic was covered recently, you might want to check the archives. > >> -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 >> 02:59:29 kensmith Exp $ >> +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm >> Exp $ > > 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. > > You can easily deal with this in mergemaster by using the -U option > (please see the man page). If you're dealing with the problem of a > clean installation from a -RELEASE CD (or similar) upgrading to the > stable branch for the first time, -U won't help you unfortunately. But > it will help you on each successive update. For that first update what > I usually do is 'rm -r /etc/rc.d/* /etc/periodic/* /etc/defaults/*' > and then use mergemaster's -i option. That will cover the majority of > the problem. > I am upgrading from 7.1-RELEASE (cd) to 7.1-STABLE, anyway it does not make any sense to "upgrade" to older version of config files. I hope this issue will be resolved. FreeBSD 7.1-STABLE #0: Wed Mar 11 22:29:33 EET 2009 amd64