From owner-freebsd-questions  Thu Nov 22  6:25:47 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from www.slackwit.com (static37.dsl.compuage.net [63.151.205.37])
	by hub.freebsd.org (Postfix) with ESMTP id 13CA737B416
	for <freebsd-questions@FreeBSD.ORG>; Thu, 22 Nov 2001 06:25:44 -0800 (PST)
Received: by www.slackwit.com (Postfix, from userid 1001)
	id 03A6918CA5; Thu, 22 Nov 2001 09:28:09 -0500 (EST)
Date: Thu, 22 Nov 2001 09:28:09 -0500
From: Kelly Hendrix <kelly@slackwit.com>
To: Anthony Atkielski <anthony@freebie.atkielski.com>
Cc: FreeBSD Questions <freebsd-questions@FreeBSD.ORG>
Subject: Re: Error on xl0
Message-ID: <20011122092809.A523@www.slackwit.com>
Reply-To: Kelly Hendrix <kelly@slackwit.com>
References: <Pine.GSO.4.31.0111221247560.2604-100000@mail.ilrt.bris.ac.uk> <021001c17359$5fa61cd0$0a00000a@atkielski.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <021001c17359$5fa61cd0$0a00000a@atkielski.com>; from anthony@freebie.atkielski.com on Thu, Nov 22, 2001 at 02:26:58PM +0100
X-Freebsd-Version: FreeBSD 4.4-RELEASE i386
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

Hello Anthony,

On Thu, Nov 22, 2001 at 02:26:58PM +0100, Anthony Atkielski wrote:

> I've copied the configuration to my own configuration file, so that's
> not a problem, presumably.  The thing is, now I've changed one of the
> source files to redefine an internal parameter ... so how do I keep
> that change to that particular source file (/sys/pci/if_xlreg.h), and
> also make sure that it doesn't interfere with the standard source?

To see the difference between two files, use diff.  See the man page for
diff for the gory details.  You might also want to keep two sets of
sources around: yours and the main source tree.  Start with the man page
for CVS , and then I suggest this site for further reading:

	http://www.cvshome.org/

Of course, the handbook also has a section on keeping your sources up to
date.

Personally, I use cvsup to keep track of my sources.  Then again, the
only files I'm modifying are the kernel configs.

Kelly Hendrix

-- 
 ______________________________________________________________________
| There are two ways to live your life.  One is as though nothing is a |
| miracle.  The other is as though everything is a miracle.            |
|                                                                      |
|	Albert Einstein (1879-1955)                                    |
|______________________________________________________________________|

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message