From owner-freebsd-current Sun May 4 08:51:01 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id IAA00625 for current-outgoing; Sun, 4 May 1997 08:51:01 -0700 (PDT) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by hub.freebsd.org (8.8.5/8.8.5) with SMTP id IAA00609 for ; Sun, 4 May 1997 08:50:57 -0700 (PDT) Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id RAA21997; Sun, 4 May 1997 17:50:55 +0200 Received: (from j@localhost) by uriah.heep.sax.de (8.8.5/8.8.5) id RAA02149; Sun, 4 May 1997 17:44:07 +0200 (MET DST) Message-ID: <19970504174407.EZ62108@uriah.heep.sax.de> Date: Sun, 4 May 1997 17:44:07 +0200 From: j@uriah.heep.sax.de (J Wunsch) To: current@FreeBSD.ORG Cc: joes@spiritone.com (Joseph Stein) Subject: Re: Help with merging in local changes with CVS etc... References: X-Mailer: Mutt 0.60_p2-3,5,8-9 Mime-Version: 1.0 X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: ; from Joseph Stein on May 4, 1997 01:57:05 -0700 Sender: owner-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Joseph Stein wrote: > I know I will need to maintain a copy of the full CVS repository, but > how do I ensure that the change will remain in effect after further > changes (pulled in with CVSup)? Are you sure you really want to check it into your CVS? I think the cvsup documentation in the handbook mentions how this would to be done, though i'm not familiar with it either. Normally, you don't need to do this however (unless you're going to develop the ppa driver further on, but in this case, i'd rather acquire you as the official FreeBSD maintainer :). If you just apply the modifications to your tree, subsequent `cvs update' operations will try its best to maintain your local changes to the checked out tree. I think i've got some 20+ files in my kernel source tree that differ from the official versions, and a few files outside the kernel. I sometimes commit the changes once they `matured' (see the syslogd commit yesterday), sometimes i don't commit them since they are unclean and need more work, some of the changes are purely local (e.g. i've totally ripped off rm'ing the old compile directory from config(8) since bothered me once too many). -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-)