Path: utzoo!utgpu!watmath!clyde!att!osu-cis!tut.cis.ohio-state.edu!cwjcc!hal!nic.MR.NET!tank!mimsy!jds
From: jds@mimsy.UUCP (James da Silva)
Newsgroups: comp.os.minix
Subject: Re: 1.2-1.3.tar upgrade HELP!!!
Keywords: tar diff patch cdiff
Message-ID: <15075@mimsy.UUCP>
Date: 19 Dec 88 18:14:09 GMT
References: <3930@hubcap.UUCP>
Reply-To: jds@mimsy.umd.edu (James da Silva)
Organization: University of Maryland, Department of Computer Science
Lines: 63

In article <3930@hubcap.UUCP> rwberry@hubcap.UUCP (Robert W Berry) writes:
>
>Now here's my problem:  what the heck do you do with that 300k
>patch.diff file.  Do you need patch or fix (I thought patch was for
>cdiff's and fix was for diff's.)  I've set up my directory structure
>according to both the rearrange file and the users_guide file.  Do I
>have to move things around so that patch (or fix) knows where the source
>files are?  Has anybody successfully gotten this update to work?  Is the
>patch.diff file only diff's to the command sources or library sources?
>And once I figure out which command to use, how do you work the darn
>things?  The closest I can figure is that they are inverses of each
>other so:
>     diff old new >difffile and then fix old difffile >new should create
>     new from old, etc.
>Am I on the right track (hopefully I'm at least close. ;-))

Patch will work with cdiffs and normal diffs.  In fact, if you've got patch
going, you should alway use it instead of fix; it's much more intelligent.

If you've rearranged things according to Vince's doc you should be ready to
do the patch.  Your Minix source tree should look like this:

	v1.3d/minix/commands
	v1.3d/minix/commands/mined
	v1.3d/minix/commands/sh
	v1.3d/minix/doc
	v1.3d/minix/fs
	v1.3d/minix/h
	v1.3d/minix/kernel
	v1.3d/minix/lib
	v1.3d/minix/lib/IBM_PC
	v1.3d/minix/mm
	v1.3d/minix/test
	v1.3d/minix/tools
	v1.3d/usr/include
	v1.3d/usr/include/fs
	v1.3d/usr/include/minix

In fact, if you want to see exactly what diffs are included in diff.patch,
grep for it:

	grep '^--- v1.3d' diff.patch

To do the patch, go to the parent directory of v1.3d, then:

	patch -lp <diff.patch

The -l option is for 'loose' matching; differences in whitespace are
ignored.  It's a bit slower, but better safe than sorry.  The -p means
don't strip the path name.

I admit with shame that I did this on a Real Unix system; I don't know if
patch under Minix will lose its lunch on such a large file.  I've heard of
problems with patch running out of temp file space, so watch out for that.
Keep a backup version of your re-arranged 1.2 tree so you can try again if
need be.

Let us know how it turns out!

Jaime
...........................................................................
: domain: jds@mimsy.umd.edu				     James da Silva
: path:   uunet!mimsy!jds