From eikemeier@fillmore-labs.com  Wed Aug 18 17:16:44 2004
Return-Path: <eikemeier@fillmore-labs.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9004216A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Aug 2004 17:16:44 +0000 (GMT)
Received: from fillmore.dyndns.org (port-212-202-50-15.dynamic.qsc.de [212.202.50.15])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2B043D49
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Aug 2004 17:16:44 +0000 (GMT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from dhcp-4.local ([172.16.0.4])
	by fillmore.dyndns.org with esmtp (Exim 4.41 (FreeBSD))
	id 1BxU3F-00079s-6d
	for freebsd-gnats-submit@FreeBSD.org; Wed, 18 Aug 2004 19:16:43 +0200
Message-Id: <41239102.1090002@fillmore-labs.com>
Date: Wed, 18 Aug 2004 19:25:22 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE

>Number:         70625
>Category:       bin
>Synopsis:       [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    re
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 18 17:20:14 GMT 2004
>Closed-Date:    Wed Mar 23 21:25:52 GMT 2005
>Last-Modified:  Wed Mar 23 21:25:52 GMT 2005
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 5.2-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 5.2-STABLE

>Description:

Reflect the fact that a RELENG_5 branch exists by supporting updates
via CVS/CVSup from this branch and naming it `-STABLE' :)

>How-To-Repeat:
>Fix:

Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.438
diff -u -r1.438 Makefile.inc1
--- Makefile.inc1	16 Aug 2004 18:17:14 -0000	1.438
+++ Makefile.inc1	18 Aug 2004 14:04:17 -0000
@@ -662,7 +662,7 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d
+	cd ${.CURDIR}; ${CVS} -R -q update -rRELENG_5 -P -d
 .endif
 
 #
Index: sys/conf/newvers.sh
===================================================================
RCS file: /home/ncvs/src/sys/conf/newvers.sh,v
retrieving revision 1.62
diff -u -r1.62 newvers.sh
--- sys/conf/newvers.sh	1 Jul 2004 06:40:12 -0000	1.62
+++ sys/conf/newvers.sh	18 Aug 2004 17:06:45 -0000
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="5.2"
-BRANCH="CURRENT"
+BRANCH="STABLE"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 
Index: share/examples/cvsup/standard-supfile
===================================================================
RCS file: /home/ncvs/src/share/examples/cvsup/standard-supfile,v
retrieving revision 1.23
diff -u -r1.23 standard-supfile
--- share/examples/cvsup/standard-supfile	24 May 2004 06:23:15 -0000	1.23
+++ share/examples/cvsup/standard-supfile	18 Aug 2004 17:01:01 -0000
@@ -51,7 +51,7 @@
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/var/db
 *default prefix=/usr
-*default release=cvs tag=.
+*default release=cvs tag=RELENG_5
 *default delete use-rel-suffix
 
 # If you seem to be limited by CPU rather than network or disk bandwidth, try

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->re 
Responsible-Changed-By: eik 
Responsible-Changed-When: Wed Aug 18 19:20:48 CEST 2004 
Responsible-Changed-Why:  
Over to release engineering for consideration. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70625 

From: Xin LI <delphij@frontfree.net>
To: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: bin/70625: [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE
Date: Thu, 19 Aug 2004 09:56:53 +0800

 --ikeVEW9yuYc//A+q
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Wed, Aug 18, 2004 at 07:25:22PM +0200, Oliver Eikemeier wrote:
 > >Description:
 >=20
 > Reflect the fact that a RELENG_5 branch exists by supporting updates
 > via CVS/CVSup from this branch and naming it `-STABLE' :)
 >=20
 > >How-To-Repeat:
 > >Fix:
 >=20
 >  #
 > Index: sys/conf/newvers.sh
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /home/ncvs/src/sys/conf/newvers.sh,v
 > retrieving revision 1.62
 > diff -u -r1.62 newvers.sh
 > --- sys/conf/newvers.sh	1 Jul 2004 06:40:12 -0000	1.62
 > +++ sys/conf/newvers.sh	18 Aug 2004 17:06:45 -0000
 > @@ -32,7 +32,7 @@
 > =20
 >  TYPE=3D"FreeBSD"
 >  REVISION=3D"5.2"
 > -BRANCH=3D"CURRENT"
 > +BRANCH=3D"STABLE"
 	   ^^^^^^  I think this might be better "5.3-BETA" at this
 		   point :-)  Here is my proposal:
 
 Index: newvers.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/fcvs/src/sys/conf/newvers.sh,v
 retrieving revision 1.62
 diff -u -r1.62 newvers.sh
 --- newvers.sh  1 Jul 2004 06:40:12 -0000       1.62
 +++ newvers.sh  19 Aug 2004 01:55:50 -0000
 @@ -31,8 +31,8 @@
  # $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $
 =20
  TYPE=3D"FreeBSD"
 -REVISION=3D"5.2"
 -BRANCH=3D"CURRENT"
 +REVISION=3D"5.3"
 +BRANCH=3D"BETA"
  RELEASE=3D"${REVISION}-${BRANCH}"
  VERSION=3D"${TYPE} ${RELEASE}"
 =20
 Cheers,
 --=20
 Xin LI <delphij frontfree net>	http://www.delphij.net/
 See complete headers for GPG key and other information.
 
 
 --ikeVEW9yuYc//A+q
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (FreeBSD)
 
 iD8DBQFBJAjlOfuToMruuMARAnHzAJ4mbY4THibZafQnYSuagPoeb5TwwgCfTXzG
 hVf6j41TXSHbJfuFyZHAR/Y=
 =kO/z
 -----END PGP SIGNATURE-----
 
 --ikeVEW9yuYc//A+q--

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: Xin LI <delphij@frontfree.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: bin/70625: [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE
Date: Thu, 19 Aug 2004 08:57:32 +0200

 Xin LI wrote:
 
 >>  TYPE="FreeBSD"
 >>  REVISION="5.2"
 >> -BRANCH="CURRENT"
 >> +BRANCH="STABLE"
 > 	   ^^^^^^  I think this might be better "5.3-BETA" at this
 > 		   point :-)  Here is my proposal:
 > [...]
 >  TYPE="FreeBSD"
 > -REVISION="5.2"
 > -BRANCH="CURRENT"
 > +REVISION="5.3"
 > +BRANCH="BETA"
 
 Ok, might make sense, my main point where the update targets.
 We should also bump __FreeBSD_version for -CURRENT.
 -Oliver
 
State-Changed-From-To: open->closed 
State-Changed-By: jhb 
State-Changed-When: Wed Mar 23 21:25:18 GMT 2005 
State-Changed-Why:  
These files were updated at some point during the 5.3 release process. 
Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70625 
>Unformatted:
