From owner-freebsd-stable Wed Jul 3 15:52:58 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24F7F37B400; Wed, 3 Jul 2002 15:52:56 -0700 (PDT) Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB17643E42; Wed, 3 Jul 2002 15:52:55 -0700 (PDT) (envelope-from crist.clark@attbi.com) Received: from blossom.cjclark.org ([12.234.91.48]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020703225255.SZAX15755.rwcrmhc53.attbi.com@blossom.cjclark.org>; Wed, 3 Jul 2002 22:52:55 +0000 Received: from blossom.cjclark.org (localhost. [127.0.0.1]) by blossom.cjclark.org (8.12.3/8.12.3) with ESMTP id g63MqsJK011790; Wed, 3 Jul 2002 15:52:54 -0700 (PDT) (envelope-from crist.clark@attbi.com) Received: (from cjc@localhost) by blossom.cjclark.org (8.12.3/8.12.3/Submit) id g63MqsLf011789; Wed, 3 Jul 2002 15:52:54 -0700 (PDT) X-Authentication-Warning: blossom.cjclark.org: cjc set sender to crist.clark@attbi.com using -f Date: Wed, 3 Jul 2002 15:52:54 -0700 From: "Crist J. Clark" To: Edwin Kremer Cc: freebsd-stable@FreeBSD.ORG, re@FreeBSD.ORG Subject: Re: RELENG_4_6 and src/Makefile.inc1 ? Message-ID: <20020703155254.C10439@blossom.cjclark.org> Reply-To: "Crist J. Clark" References: <20020628141704.GA41495@xinu.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20020628141704.GA41495@xinu.nl>; from edwin+freebsd-stable@ehk.xs4all.nl on Fri, Jun 28, 2002 at 04:17:04PM +0200 X-URL: http://people.freebsd.org/~cjc/ 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 On Fri, Jun 28, 2002 at 04:17:04PM +0200, Edwin Kremer wrote: > Hi, > > in order to move ahead on the 4.6 security branch, I tried to checkout > src/Makefile.inc1 so that "make update" will work: > > # cd /usr/src ; cvs update -rRELENG_4_6 Makefile.inc1 > > However, the resulting Makefile.inc1 still does a: > > cd /usr/src; cvs -q update -rRELENG_4 -P -d > > My local CVS repository is up to date (cvsup-ed today at 13:25 UTC) and > I don't see anything badly mangled in there. Is the RELENG_4_6 tag set > on the wrong version ? Or... ? Looks like another change to be made by re@ along with the changes to examples/cvsup/standard-supfile, etc. re@, can you make the change? Or with approval, I'll go in and fix. Please add this change to the checklist for the future. -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message