From owner-freebsd-net Tue May 12 10:49:00 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA15183 for freebsd-net-outgoing; Tue, 12 May 1998 10:49:00 -0700 (PDT) (envelope-from owner-freebsd-net@FreeBSD.ORG) Received: from austin.polstra.com (austin.polstra.com [206.213.73.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA14600; Tue, 12 May 1998 10:46:37 -0700 (PDT) (envelope-from jdp@austin.polstra.com) Received: from austin.polstra.com (jdp@localhost) by austin.polstra.com (8.8.8/8.8.8) with ESMTP id KAA05691; Tue, 12 May 1998 10:45:55 -0700 (PDT) (envelope-from jdp) Message-Id: <199805121745.KAA05691@austin.polstra.com> To: dag-erli@ifi.uio.no (Dag-Erling Coidan =?iso-8859-1?Q?Sm=F8rgrav?= ) cc: "Jordan K. Hubbard" , net@FreeBSD.ORG, core@FreeBSD.ORG Subject: Re: INRIA IPv6 on FreeBSD In-reply-to: Your message of "12 May 1998 19:39:34 +0200." Date: Tue, 12 May 1998 10:45:55 -0700 From: John Polstra Sender: owner-freebsd-net@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > But I still would like to run STABLE, and any attempt to cvsup will > clobber the IPv6 code... I'd suggest: CVSup the CVS repository "cvs checkout" the -stable sources Apply the IPv6 patches in your working directory In the future, use "cvs update" to update your sources CVS update usually does a pretty good job of merging with any local changes that you have in your working directory. -- John Polstra jdp@polstra.com John D. Polstra & Co., Inc. Seattle, Washington USA "Self-knowledge is always bad news." -- John Barth To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-net" in the body of the message