From owner-freebsd-stable Mon May 31 23: 7:57 1999 Delivered-To: freebsd-stable@freebsd.org Received: from gratis.grondar.za (gratis.grondar.za [196.7.18.65]) by hub.freebsd.org (Postfix) with ESMTP id 3896D15625 for ; Mon, 31 May 1999 23:07:50 -0700 (PDT) (envelope-from mark@grondar.za) Received: from greenpeace.grondar.za (greenpeace.grondar.za [196.7.18.132]) by gratis.grondar.za (8.9.3/8.9.3) with ESMTP id IAA01624; Tue, 1 Jun 1999 08:07:46 +0200 (SAST) (envelope-from mark@grondar.za) Received: from grondar.za (localhost [127.0.0.1]) by greenpeace.grondar.za (8.9.3/8.9.3) with ESMTP id IAA11777; Tue, 1 Jun 1999 08:07:45 +0200 (SAST) (envelope-from mark@grondar.za) Message-Id: <199906010607.IAA11777@greenpeace.grondar.za> To: Brook Miles Cc: freebsd-stable@FreeBSD.ORG Subject: Re: Keeping custom changes during a cvsup Date: Tue, 01 Jun 1999 08:07:44 +0200 From: Mark Murray Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > > Can somebody point me in the right direction for maintaining custom > changes made to the source tree while still keeping up to date with > -stable or whatever branch you're following? > > For example the fix for PR bin/11860 consists of adding a line of code to > inetd.c, but cvsup'ing again clobbers the change. Use CVS. Cvsup the CVS repository, and "cvs update" your sources. The downside is a load of needed extra disk space. M -- Mark Murray Join the anti-SPAM movement: http://www.cauce.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message