From owner-freebsd-stable Wed Mar 27 8:20:19 2002 Delivered-To: freebsd-stable@freebsd.org Received: from www.example.org (ANice-103-1-2-95.abo.wanadoo.fr [80.11.145.95]) by hub.freebsd.org (Postfix) with SMTP id CD40E37B404 for ; Wed, 27 Mar 2002 08:20:11 -0800 (PST) Received: (qmail 903 invoked by uid 1000); 27 Mar 2002 16:20:08 -0000 Date: Wed, 27 Mar 2002 17:20:08 +0100 From: Marco Molteni To: freebsd-hackers@freebsd.org Subject: [PATCH] src/examples/cvsup/README Message-ID: <20020327172008.A866@cobweb.example.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="BXVAT5kNtrzKuDFl" Content-Disposition: inline User-Agent: Mutt/1.2.5.1i 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 --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline [BCCed to -stable] Hi all, I was used to stable-supfile used to track -stable and standard-supfile used to track -current. Since april 2001 this is no more the case, and standard-supfile tracks the branch it was originally pulled from. I don't want to go into a bikeshed painting contest, but I have a suggested modification to src/examples/cvsup/README that at least explains to the unawary what has changed. Feel free to edit to taste. thanks Marco --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="src::share::examples::cvsup::README.diff" --- README.old Wed Mar 27 16:51:02 2002 +++ README Wed Mar 27 17:11:42 2002 @@ -5,6 +5,17 @@ with CVSup version 14.0 or later. For general information on CVSup itself, please see http://www.freebsd.org/handbook/cvsup.html +WARNING: There are two "standard-supfile". Keep reading for details. + +Since april 2001, "standard-supfile" defaults to the branch from which +the file came. So if you pull down RELENG_4 it defaults to RELENG_4, +if you pull down -current it defaults to -current. + +An easy way to get the latest "standard-supfile" for the branch you are +interested in is to browse the CVS web interface at +http://www.freebsd.org/cgi/cvsweb.cgi/src/share/examples/cvsup/standard-supfile + + To maintain the sources for the FreeBSD-current release, use: standard-supfile Main source tree @@ -14,6 +25,10 @@ To maintain the sources for the FreeBSD-stable release, use: stable-supfile Main source tree + + or + + standard-supfile Main source tree To maintain a copy of the CVS repository containing all versions of FreeBSD, use: --BXVAT5kNtrzKuDFl-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message