From owner-freebsd-stable Mon Mar 10 10:31:38 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 2480E37B401 for ; Mon, 10 Mar 2003 10:31:37 -0800 (PST) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07C7D43FB1 for ; Mon, 10 Mar 2003 10:31:36 -0800 (PST) (envelope-from DougB@freebsd.org) Received: from master.gorean.org (12-234-22-23.client.attbi.com[12.234.22.23]) by sccrmhc02.attbi.com (sccrmhc02) with SMTP id <2003031018313400200t3fuue>; Mon, 10 Mar 2003 18:31:35 +0000 Date: Mon, 10 Mar 2003 10:31:33 -0800 (PST) From: Doug Barton To: John Von Essen Cc: freebsd-stable@freebsd.org Subject: Re: RELENG_4 Tag... In-Reply-To: <20030310094853.L3006-100000@beck.quonix.net> Message-ID: <20030310102849.K6284@znfgre.tberna.bet> References: <20030310094853.L3006-100000@beck.quonix.net> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 On Mon, 10 Mar 2003, 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. RELENG_4 is a branch in cvs. Things like "4.8-RC" and "4.7-STABLE" are just descriptive strings placed in /sys/conf/newvers.sh to refer to specific points in time in the development process. > Also, mergemaster completely obliterated my system. Had to copy everything > back from by backup. Good thing you made a backup then. :) Can you provide more details about how mm obliterated your system? Since the defaults for it are always to do nothing, I have a hard time blaming the tool here.... Doug -- This .signature sanitized for your protection To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message