From owner-freebsd-bugs@FreeBSD.ORG Wed Aug 18 17:20:14 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF2FB16A4CE for ; Wed, 18 Aug 2004 17:20:14 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B44B043D5A for ; Wed, 18 Aug 2004 17:20:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i7IHKESr047953 for ; Wed, 18 Aug 2004 17:20:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7IHKE99047952; Wed, 18 Aug 2004 17:20:14 GMT (envelope-from gnats) Resent-Date: Wed, 18 Aug 2004 17:20:14 GMT Resent-Message-Id: <200408181720.i7IHKE99047952@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9004216A4CE for ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org Subject: bin/70625: [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2004 17:20:15 -0000 >Number: 70625 >Category: bin >Synopsis: [PATCH] RELENG_5 CVS/CVSup fixes, -CURRENT -> -STABLE >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 18 17:20:14 GMT 2004 >Closed-Date: >Last-Modified: >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: >Unformatted: