From owner-freebsd-stable Mon Mar 10 10:15:18 2003 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D231F37B401 for ; Mon, 10 Mar 2003 10:15:16 -0800 (PST) Received: from pa-plum1b-166.pit.adelphia.net (pa-plum1b-13.pit.adelphia.net [24.53.161.13]) by mx1.FreeBSD.org (Postfix) with ESMTP id E427B43F85 for ; Mon, 10 Mar 2003 10:15:15 -0800 (PST) (envelope-from wmoran@potentialtech.com) Received: from potentialtech.com (working [172.16.0.95]) by pa-plum1b-166.pit.adelphia.net (8.12.7/8.12.7) with ESMTP id h2AIF2Tb005921; Mon, 10 Mar 2003 13:15:13 -0500 (EST) (envelope-from wmoran@potentialtech.com) Message-ID: <3E6CD657.4050405@potentialtech.com> Date: Mon, 10 Mar 2003 13:15:51 -0500 From: Bill Moran User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.2.1) Gecko/20030301 X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Von Essen Cc: freebsd-stable@freebsd.org Subject: Re: RELENG_4 Tag... References: <20030310094853.L3006-100000@beck.quonix.net> In-Reply-To: <20030310094853.L3006-100000@beck.quonix.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Von Essen wrote: > I am confused about something. > > I just did a cvsup to RELENG_4. But after building my kernel, it shows > 4.8-RC, not 4.7-STABLE > > Is there a reason for this? Yes, the code is in freeze right now for testing for 4.8-RELEASE. Thus the head of the 4.X code tree is a release candidate for 4.8 at this time. > Also, mergemaster completely obliterated my system. Had to copy everything > back from by backup. Always backup /etc before running mergemaster, although I've never had problems. > Let me ask this. My feelings with mergemaster are as follows: > > I rather install a completely new /etc, then go in and make changes to the > two or three files that I need to modify, usually just mail/, rc.conf, and > the passwd files. That will work as well, but you should still back up /etc before doing this. > Is there a way to do this with mergemaster? I don't think so, but mergemaster creates a new /etc under (I think) /tmp. So you could read through the mergemaster script and see how it creates this and just do the same thing. -- Bill Moran Potential Technologies http://www.potentialtech.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message