From owner-freebsd-current  Wed Jan 20 23:57:27 1999
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id XAA00193
          for freebsd-current-outgoing; Wed, 20 Jan 1999 23:57:27 -0800 (PST)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from apollo.backplane.com (apollo.backplane.com [209.157.86.2])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id XAA00188
          for <current@FreeBSD.ORG>; Wed, 20 Jan 1999 23:57:25 -0800 (PST)
          (envelope-from dillon@apollo.backplane.com)
Received: (from dillon@localhost)
	by apollo.backplane.com (8.9.2/8.9.1) id XAA12288;
	Wed, 20 Jan 1999 23:57:09 -0800 (PST)
	(envelope-from dillon)
Date: Wed, 20 Jan 1999 23:57:09 -0800 (PST)
From: Matthew Dillon <dillon@apollo.backplane.com>
Message-Id: <199901210757.XAA12288@apollo.backplane.com>
To: Gregory Bond <gnb@itga.com.au>
Cc: current@FreeBSD.ORG
Subject: Re: some guidance on forked cvsup please
References:  <199901210732.SAA09979@lightning.itga.com.au>
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


:Now we've gone and got forked, can someone please give us examples of cvsup 
:files for those that want to follow 4-current and those that want to follow 
:3-stable.
:
:Thanks!

    It's real simple.  The -stable is the 3.x branch.  This is the branch
    that Jordan just created tonight.  So, for example, if you do a 
    'cvs log kern/vfs_bio.c' you will see this:

	    ...
	    head: 1.193
	    ...
	    RELENG_3: 1.193.0.2
	    RELENG_3_BP: 1.193

    What this means is that the HEAD of the CVS tree is 1.193, and 
    RELENG_3 ( the new -stable ) has been forked off as 1.193.0.2.

    If your files are currently checked out and have the HEAD branch's
    revision, then anything you checkin will be checked in under
    -current ( the -4.x tree ).

    If your files are currently checked out and have RELENG_3's branch
    revision, then anything you check in will be checked in under
    -stable ( the -3.x tree ).

    If you haven't messed with your CVS tree and it was previously
    -current ( 3.x ), it is still -current, but is now 4.x.

					-Matt
					Matthew Dillon 
					<dillon@backplane.com>


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message