From owner-freebsd-questions Thu Sep 13 10:53:34 2001 Delivered-To: freebsd-questions@freebsd.org Received: from relay3-gui.server.ntli.net (relay3-gui.server.ntli.net [194.168.4.200]) by hub.freebsd.org (Postfix) with ESMTP id 72F6137B417 for ; Thu, 13 Sep 2001 10:53:27 -0700 (PDT) Received: from pc2-card3-0-cust96.cdf.cable.ntl.com ([213.107.2.96] helo=rhadamanth.private.submonkey.net) by relay3-gui.server.ntli.net with esmtp (Exim 3.03 #2) id 15haQ6-0004jn-00; Thu, 13 Sep 2001 18:36:58 +0100 Received: from setantae by rhadamanth.private.submonkey.net with local (Exim 3.22 #1) id 15hafg-0000d7-00; Thu, 13 Sep 2001 18:53:04 +0100 Date: Thu, 13 Sep 2001 18:53:04 +0100 From: setantae To: Christian Weisgerber Cc: freebsd-questions@freebsd.org Subject: Re: cvsup not getting all changes Message-ID: <20010913185304.B2346@rhadamanth> References: <20010913111735.A10679@cartman.private.techsupport.co.uk> <9nqjf8$1k56$2@kemoauc.mips.inka.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <9nqjf8$1k56$2@kemoauc.mips.inka.de>; from naddy@mips.inka.de on Thu, Sep 13, 2001 at 03:30:48PM +0000 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Sep 13, 2001 at 03:30:48PM +0000, Christian Weisgerber wrote: > Ceri wrote: > > > If I want to track -stable, should I be using the MAIN or RELENG_4 tag ? > > RELENG_4 Good, that's what I thought. > > I thought that RELENG_4 should do it, but it appears I'm not getting all > > changes to the tree. > > Obviously not. You are getting only the changes to the RELENG_4 > branch. Yeah, got all confused about MAIN. > > Specifically, /usr/share/examples/ipfw/change_rules.sh was updated to > > revision 1.3 back on June 18th in MAIN, but I'm only getting 1.2.2.1 > > (since I'm using RELENG_4). > > Yes, 1.2->1.3 is a change in -CURRENT. You are getting the head > of the RELENG_4 branch, revision 1.2.2.1 in this case. Ah hah! Don't suppose anyone wants to MFC it then - 1.2.2.1 is broken. (after 4.4 is released will be soon enough) > > What is MAIN for ? > > MAIN doesn't really exist. CVSweb uses this as a symbol for the > unmarked main branch of the repository. Ace, thanks. -- keep a mild groove on To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message