problems with patching

[c***@CSIC.UMD.EDU]

when i run the
patching commands i
get:

Reversed (or
previously applied)
patch detected!
Assume -R? [n]

i tried just
pressing enter and
it creates reject
files. if i type yes
then i get the
patching completed.
but after looking at
the files, i.e.
kthread.c i think it
just overwrote the
file with my p2
files.

i did:

#


$ cd
~/project2/src/geekos
$ diff -u -r .
~/project3/src/geekos

~/diff.patch

# And then integrate
them into project 3
base:


$ cd
~/project3/src/geekos
$ patch -p0 <
~/diff.patch
$ rm *orig

any help? or is it
just better to go
into all the files
of project2 and copy
the code into
project3 files:
syscall.c kthread.c
main.c elf.c
userseg.c user.c

[Joe Barrett]

You aren't supposed to diff your project 2 solution with the project 3
files - you're supposed to diff your project 2 solution with the "i
haven't done any work yet" project 2 files we were given [project2.tgz
on the webpage]. This will create a diff file showing exactly what you
changed in project 2, which can then be integrated with patch into
project 3.

Copying over your project2 files to the project3 directory might work,
but I'd advise against it because you may run into problems later.

Joe

[c***@CSIC.UMD.EDU]

thank you. that worked.