From owner-freebsd-current@FreeBSD.ORG Mon Dec 6 18:59:59 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D46616A4CF for ; Mon, 6 Dec 2004 18:59:59 +0000 (GMT) Received: from smtp001.bizmail.yahoo.com (smtp001.bizmail.yahoo.com [216.136.172.125]) by mx1.FreeBSD.org (Postfix) with SMTP id 9D31E43D53 for ; Mon, 6 Dec 2004 18:59:58 +0000 (GMT) (envelope-from noackjr@alumni.rice.edu) Received: from unknown (HELO optimator.noacks.org) (noackjr@supercrime.org@70.240.198.174 with login) by smtp001.bizmail.yahoo.com with SMTP; 6 Dec 2004 18:59:57 -0000 Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 0D6CC614D; Mon, 6 Dec 2004 12:59:56 -0600 (CST) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 69136-11; Mon, 6 Dec 2004 12:59:44 -0600 (CST) Received: from www.noacks.org (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 9FA1560F0; Mon, 6 Dec 2004 12:59:44 -0600 (CST) Received: from 69.53.57.66 (SquirrelMail authenticated user noackjr); by www.noacks.org with HTTP; Mon, 6 Dec 2004 12:59:44 -0600 (CST) Message-ID: <8783.69.53.57.66.1102359584.squirrel@69.53.57.66> In-Reply-To: <41B40C97.7000102@yahoo.com> References: <41B40C97.7000102@yahoo.com> Date: Mon, 6 Dec 2004 12:59:44 -0600 (CST) From: "Jon Noack" To: "Rob" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Virus-Scanned: amavisd-new at noacks.org cc: freebsd-current cc: freebsd-stable@freebsd.org Subject: Re: names of supfiles in /usr/share/examples/cvsup X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: noackjr@alumni.rice.edu List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Dec 2004 18:59:59 -0000 Rob wrote: > For 5.3 in /usr/share/examples/cvsup, there's: > > stable-supfile : for FreeBSD-stable > standard-supfile : for FreeBSD-current > > I find this naming rather confusing. Why "stable" refers to STABLE, but > "standard" refers to CURRENT ? Actually, this is not correct. For 5.3-RELEASE and RELENG_5_3, standard-supfile points to RELENG_5_3. For RELENG_5, standard-supfile points to RELENG_5 (despite the incorrect comment at the top saying it gets you -CURRENT -- look at the actual CVS tag used). For -CURRENT, standard-supfile points to "." (HEAD). Thus, standard-supfile keeps you on the branch you are using. I like that the "standard" is to keep you on the branch you are using. This makes sense to me. I think adding a current-supfile would reduce confusion (seems like it's the time of year to discuss this: http://lists.freebsd.org/pipermail/freebsd-current/2003-December/016071.html). However, the biggest problem is definitely the incorrect comment in standard-supfile... Jon