I update my source tree to the patch branch, and I'm now compiling the
kernel. however I already had to edit a couple of files because the
first lines where something like this:
<<<<<<< pf.c
/* $OpenBSD: pf.c,v 1.166 2001/11/13 17:45:26 frantzen Exp $ */
=======
/* $OpenBSD: pf.c,v 1.163.2.4 2002/02/21 04:23:24 jason Exp $ */
>>>>>>> 1.163.2.4
1) why the first comment has a more recent version number while the
second has a more recent date??
2) I can be sure that the code inside that file has been patched
correctly or there are chances that something went wrong? I mean, it
was compiled correclty after I fixed the above lines, but I don't know
if the code inside that file was still the old one or if cvs updated
it.
--
Shiva
"Better true to yourself
Than a perfect shadow
Of somebody else
An empty shell"
(MrBig, My new religion)
|