From owner-freebsd-hackers Wed Sep 5 12:20:17 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from ns.yogotech.com (ns.yogotech.com [206.127.123.66]) by hub.freebsd.org (Postfix) with ESMTP id 07BDF37B401 for ; Wed, 5 Sep 2001 12:20:10 -0700 (PDT) Received: from nomad.yogotech.com (nomad.yogotech.com [206.127.123.131]) by ns.yogotech.com (8.9.3/8.9.3) with ESMTP id NAA05473; Wed, 5 Sep 2001 13:20:04 -0600 (MDT) (envelope-from nate@nomad.yogotech.com) Received: (from nate@localhost) by nomad.yogotech.com (8.8.8/8.8.8) id NAA17159; Wed, 5 Sep 2001 13:20:02 -0600 (MDT) (envelope-from nate) From: Nate Williams MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15254.31457.818766.916542@nomad.yogotech.com> Date: Wed, 5 Sep 2001 13:20:01 -0600 To: tlambert2@mindspring.com Cc: John Polstra , hackers@FreeBSD.ORG, roam@ringlet.net Subject: Re: local changes to CVS tree In-Reply-To: <3B967827.F166E3A6@mindspring.com> References: <20010905131027.A5476@fump.kawo2.rwth-aachen.de> <20010905142800.C633@ringworld.oblivion.bg> <200109051723.f85HNbl07385@vashon.polstra.com> <3B967827.F166E3A6@mindspring.com> X-Mailer: VM 6.95 under 21.1 (patch 12) "Channel Islands" XEmacs Lucid Reply-To: nate@yogotech.com (Nate Williams) Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > > CVS claims to support multiple vendor branches, but in practice it > > doesn't work in any useful sense. There's at least one place in the > > CVS sources where "the" vendor branch is hard-coded as 1.1.1. You > > really don't want to use multiple vendor branches -- trust me. :-) > > Use two repositories instead, or use perforce. > > I guess I'll ask the usual question: > > Any chance of getting CVSup to transfer from a remote repository > to a local vendor branch, instead of from a remote repository to > a local repository? The problem is that you aren't just transferring bits from the HEAD, but from multiple active branches. As John already stated, CVS doesn't handle multiple 'vendor' branches well (and in this case, the FreeBSD tree has vendor (CSRG) branches, FreeBSD vendor branches (RELENG_2, RELENG_3, ..., contrib vendor branches (TCSH, GCC, etc..) CVS is simply not setup to do what you ask. :( Nate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message