From owner-freebsd-questions@FreeBSD.ORG Thu May 17 18:32:01 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49D1516A402 for ; Thu, 17 May 2007 18:32:01 +0000 (UTC) (envelope-from af300wsm@gmail.com) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.178]) by mx1.freebsd.org (Postfix) with ESMTP id 07C1313C4BB for ; Thu, 17 May 2007 18:32:00 +0000 (UTC) (envelope-from af300wsm@gmail.com) Received: by py-out-1112.google.com with SMTP id f31so914114pyh for ; Thu, 17 May 2007 11:32:00 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=XpxPVVd/SbE9ZOkUbTJf0ccbmss+zb+xk+w9tztQzLZ9UcNjGLWsCDm2KZhnqfrm2TdujJaKtcwrfn4kAM1Buthx2XNZEmjkozRVn1vEvC2Mqb/zOpMY7x6DyL5F5PRLJZkNMxEBSl8s4l9oKdreeMoJfIlUSogw4f+Gz9A8Y3U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=IDZ5PwmM2jaoP1EGQ1FBmIPrHcHdYOIAK5eEcvmSCWClsV5IS3Muml3ALujKde1mSTykrCb4bAn0uVZO5+e4lhrkLpui7kLHs17mhULYgEkQLykJ6mQfi2YEVbRqmPeVqHTzVYdz+QsyvSaBIAfZMhYl/U4bEYOjOdDBp5zN/Mw= Received: by 10.35.103.6 with SMTP id f6mr1146337pym.1179426720164; Thu, 17 May 2007 11:32:00 -0700 (PDT) Received: by 10.35.36.17 with HTTP; Thu, 17 May 2007 11:31:59 -0700 (PDT) Message-ID: <340a29540705171131j5ab024f4qf8957d52460cdad@mail.gmail.com> Date: Thu, 17 May 2007 12:31:59 -0600 From: "Andrew Falanga" To: "Alex Zbyslaw" In-Reply-To: <464C74D3.7070308@dial.pipex.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <340a29540705170804r51e4d073w9da7eaf9203e85bd@mail.gmail.com> <464C74D3.7070308@dial.pipex.com> Cc: freebsd-questions Subject: Re: A little bit of help understanding CVS and cvsup X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2007 18:32:01 -0000 On 5/17/07, Alex Zbyslaw wrote: > Andrew Falanga wrote: > > You can find a description of release tags in the handbook. > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cvs-tags.html > and also a description of -STABLE and -CURRENT > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html. > > Later bits in that section also describe the update procedure *even if > you are updating to a RELEASE./RELENG rather then CURRENT or STABLE*. > > A brief description of the strings in tags is a follows: > > CURRENT == bleeding edge > > STABLE == merely leading edge > > RELENG == what you are calling "stable"; a release plus security patches > only > > RELEASE == sort of you are calling stable, exactly what was released > (not recommended since it lacks any security patches) > > The latest release is 6.2, so the tag you want in your supfile is > RELENG_6_2. That string won't be in any supfile on your system. It's > impossible for it to be, since that would require predicting what will > be the latest release at the point in the future when you chose to > upgrade :-) > > In technical terms, CURRENT is the top of the main development trunk, > and is often referred to with a leading number (e.g. 7-CURRENT), but the > number does no more than denote the numeric tag that will be applied > when the next branch is made. Once 7.0 starts being created, CURRENT > will be 8-CURRENT. > > STABLE is the latest branch. Code here will become the next Release. > Moving code from CURRENT to STABLE, involves a CVS merge operation and > is often referred to as MFC - merge from CURRENT. > > RELENG is a branch created when a specific release is made. It denotes > the latest code on that branch, but the only changes made will be > critical security fixes. > > RELEASE is just the point on the RELENG branch which is the actual code > which was released on the Release CDs. > > --Alex > > PS > > Be really nice if all this info was clearly in the FAQ, and the FAQ was > searchable apart from the whole website. As things stand, a search for > "stable" returns precisely nothing, which can't be right. > > > > Thank you for the detailed description. Just one last question for you and the list, what sort of heart ache can I expect to encounter if I use the label RELEASE_6_2 in my supfile on a system that is 6.0? I need to upgrade a 6.0-RELEASE (no patches) system. Will I encounter compiler problems (that is, I'm using a compiler that's older than I should for 6.2), or similar? Or, should the upgrade be just as smooth as the run through I just completed on a non-critical notebook running 6.2-RELEASE (or rather, it was running 6.2-RELEASE, now it's 6.2-RELEASE-p4)? Thanks again, Andy