From owner-freebsd-hackers Wed Sep 5 7:15:29 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from ringworld.nanolink.com (sentinel.office1.bg [217.75.135.254]) by hub.freebsd.org (Postfix) with SMTP id E26A237B406 for ; Wed, 5 Sep 2001 07:15:07 -0700 (PDT) Received: (qmail 1266 invoked by uid 1000); 5 Sep 2001 11:28:00 -0000 Date: Wed, 5 Sep 2001 14:28:00 +0300 From: Peter Pentchev To: Alexander Langer Cc: freebsd-hackers@FreeBSD.org Subject: Re: local changes to CVS tree Message-ID: <20010905142800.C633@ringworld.oblivion.bg> Mail-Followup-To: Alexander Langer , freebsd-hackers@FreeBSD.org References: <20010905131027.A5476@fump.kawo2.rwth-aachen.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010905131027.A5476@fump.kawo2.rwth-aachen.de>; from alex@big.endian.de on Wed, Sep 05, 2001 at 01:10:27PM +0200 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 On Wed, Sep 05, 2001 at 01:10:27PM +0200, Alexander Langer wrote: > Thus spake Kris Kennaway (kris@obsecurity.org): > > > On Wed, Sep 05, 2001 at 09:52:34AM +0300, Giorgos Keramidas wrote: > > > > > I have it fixed now in my local CVS tree. Hopefully Kris will commit > > > something to fix it soon :-) > > I'm just curious: > How do people fix stuff in their local CVS tree and sync other > FreeBSD changes with that? > > I mean I have much stuff, which gets > M file > in the next cvs update, but I'd really like to cvs commit them > to my local /home/ncvs, but cvsup will overwrite these changes. One way that (I think it was) Sheldon pointed out to me a few months ago would be keeping your own CVS repository and vendor-importing the FreeBSD source on a regular basis. The regular vendor-import is quite time-consuming though :( Also, I'm not really sure if CVS would allow having two vendor branches (say, RELENG_4 and RELENG_5) and two corresponding working branches (your changes to RELENG_4 and your changes to RELENG_5, which might be *way* different). G'luck, Peter -- Thit sentence is not self-referential because "thit" is not a word. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message