From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 13:58:58 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 A93D3106567B; Thu, 12 Mar 2009 13:58:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 778FA8FC16; Thu, 12 Mar 2009 13:58:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (pool-98-109-39-197.nwrknj.fios.verizon.net [98.109.39.197]) by cyrus.watson.org (Postfix) with ESMTPSA id 1CD3D46B06; Thu, 12 Mar 2009 09:58:58 -0400 (EDT) Received: from localhost (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id n2CDwVOI046493; Thu, 12 Mar 2009 09:58:52 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: freebsd-stable@freebsd.org Date: Thu, 12 Mar 2009 08:49:06 -0400 User-Agent: KMail/1.9.7 References: <49B8AB66.9080408@bsd.ee> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200903120849.06549.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 12 Mar 2009 09:58:52 -0400 (EDT) X-Virus-Scanned: ClamAV 0.94.2/9100/Thu Mar 12 05:07:56 2009 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Andrei Kolu , Doug Barton 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 13:58:59 -0000 On Thursday 12 March 2009 3:22:19 am 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. No, it's a bug in our SVN -> CVS importer that when the branch is created in SVN, all the files get forced checkins on the CVS branch which gratuitously bumps all the CVS IDs. Go compare RELENG_6_3 and RELENG_6 (at the time of the branch) IDs vs what happened with 6.4 and 7.1. It does create a _lot_ of noise for later /etc merges. Probably our SVN -> CVS importer could simply ignore commits that create a new branch to avoid this problem. -- John Baldwin