From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 07:47:59 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 F36DC106568A for ; Thu, 12 Mar 2009 07:47:58 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 82F108FC0C for ; Thu, 12 Mar 2009 07:47:58 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 20207 invoked by uid 399); 12 Mar 2009 07:47:55 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 12 Mar 2009 07:47:55 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49B8BE29.3050604@FreeBSD.org> Date: Thu, 12 Mar 2009 00:47:53 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090312) MIME-Version: 1.0 To: Andrei Kolu References: <49B8AB66.9080408@bsd.ee> <49B8BA35.802@bsd.ee> In-Reply-To: <49B8BA35.802@bsd.ee> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Stable 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:48:00 -0000 Andrei Kolu wrote: > Doug Barton wrote: >>> -# $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, > > 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. Please read what I said above more carefully, especially the bit about the content of the files being the same. > I hope this issue will be resolved. What you're seeing is a mildly annoying side effect of how CVS works. There is nothing to resolve. On the other hand, if we follow through with cutting releases on the 8.x branch with subversion we won't have this problem. So perhaps that will help in your situation. Doug -- This .signature sanitized for your protection