Path: utzoo!attcan!utgpu!watmath!att!tut.cis.ohio-state.edu!gem.mps.ohio-state.edu!wuarchive!cs.utexas.edu!uunet!ncrlnk!ncr-sd!hp-sdd!hplabs!hpfcso!hpldola!hpctdlb!jwf
From: jwf@hpctdlb.HP.COM (John Freeborg)
Newsgroups: comp.os.minix
Subject: Diff/Patch Problems!
Message-ID: <2280004@hpctdlb.HP.COM>
Date: 20 Sep 89 19:26:13 GMT
Organization: Hewlett-Packard CTD, Colo. Spgs.
Lines: 47


  Help!  I've got Minix 1.1 source on my Vectra's MSDOS HD.  I've FTP'd the
diff stuff to convert from 1.1 -> 1.2 and from 1.2 -> 1.3.  However, the
patch files that come in those tar packages seem to be of a different format
than the one that Minix's diff puts out.  Specifically its got lines that
look like:

****************
*** 242,246 

     blah blah blah

--- 242,246 ----
 
     blah blah blah blah

Now the Minix diff that I have (Erik's) puts out stuff that looks like:

12c12
<    blah
<    blah
<    blah
>    blah
>    blah
>    blah
>    blah

Also the patch program that I have expects the diff to look like the second
example.

So how do I go about patching my 1.1 stuff to get it to 1.2 since the patch
file is in a different format than the patch program expects?

Incidently - I got the 1.1 -> 1.2 and 1.2 -> 1.3 diff packages from
bugs.nosc.mil.

Thanks a million for any help!
   John
      Freeborg


------------------------------------------------------------------------------
John W. Freeborg			Hewlett Packard Company
jwf@hpcsos.col.hp.com			Colorado Telecommunications Division
Disclaimer = 				5070 Centennial Blvd.
'The opinions expressed are not		Colorado Springs, CO  80919
 necessarily those of my employer.'	(719) 531-4771