Subject: Re: how to merge 1.3.1 diffs into 1.3 src?
To: None <mcmahill@mtl.mit.edu>
From: Feico Dillema <dillema@acm.org>
List: netbsd-help
Date: 04/20/1998 11:37:44
Your message dated: Sun, 19 Apr 1998 21:57:36 -0400

This worked for me (although it me not be the perfect way):

cd /usr/src
gunzip -cd netbsd-1.3-1.3.1.diff.gz | patch -f -p1 


The -p1 strips the first part of the filenames in the diff, so
that it works for files in the current directory, and I used -f
(force) as I only had the kernel sources installed (I guess you do 
too on the zip) and the -f option will cause patch to ignore patches
for files it cannot find.

Feico.
        
>
>
>I hope this is the right place for this one.  I'm getting ready to upgrade
>from 1.3 to 1.3.1, but need to compile my own kernel (need a nonstandard
>set of options).  Is there a simple command which takes the 
>netbsd-1.3-1.3.1.diff.gz file and updates my /usr/src/sys/......
>source tree from 1.3?  (then hopefully I can just use my old 1.3 config file
>and do 
>make depend
>make
>
>as I did last time)