[ns] patch doesn't work
Huiwen Li
huiwenli@nortelnetworks.com
Thu, 9 Mar 2000 14:36:55 -0800
This message is in MIME format. Since your mail reader does not understand
this format, some or all of this message may not be legible.
------_=_NextPart_001_01BF8A17.F90AD1E0
Content-Type: text/plain
Hi,
I download some patches from the read-only CVS history, but when I use patch
< patchfile, it gave me the following error:
patch < webtraf_patch.h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|===================================================================
|RCS file: /usr/src/mash/cvsweb-repository/ns-2/webcache/webtraf.h,v
|retrieving revision 1.3
|retrieving revision 1.4
|diff -u -r1.3 -r1.4
|--- ns-2/webcache/webtraf.h 1999/11/18 22:31:29 1.3
|+++ ns-2/webcache/webtraf.h 2000/02/24 02:17:02 1.4
--------------------------
Patching file webtraf.h using Plan A...
Hunk #1 failed at 30.
Hunk #2 failed at 59.
Hunk #3 failed at 85.
Hunk #4 failed at 146.
4 out of 4 hunks failed--saving rejects to webtraf.h.rej
done
I tried several ways (parameters -u....) but it didn't work. Actually I
could use patch command on my machine to patch files from NS when I
downloaded NS. I am wondering if there is any change to the way you write
patch files? Or I need to update my patch exe?
Thanks,
Huiwen
------_=_NextPart_001_01BF8A17.F90AD1E0
Content-Type: text/html
Content-Transfer-Encoding: quoted-printable
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =
charset=3Dus-ascii">
<META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version =
5.5.2651.65">
<TITLE>patch doesn't work</TITLE>
</HEAD>
<BODY>
<P><FONT SIZE=3D2 FACE=3D"Arial">Hi, </FONT>
</P>
<P><FONT SIZE=3D2 FACE=3D"Arial">I download some patches from the =
read-only CVS history, but when I use patch < patchfile, it gave me =
the following error: </FONT></P>
<P><FONT SIZE=3D2 FACE=3D"Courier New">patch < webtraf_patch.h =
</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Hmm... Looks like a =
unified diff to me...</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">The text leading up to this =
was:</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier =
New">--------------------------</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier =
New">|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|RCS file: =
/usr/src/mash/cvsweb-repository/ns-2/webcache/webtraf.h,v</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|retrieving revision 1.3</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|retrieving revision 1.4</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|diff -u -r1.3 -r1.4</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|--- =
ns-2/webcache/webtraf.h 1999/11/18 =
22:31:29 1.3</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">|+++ =
ns-2/webcache/webtraf.h 2000/02/24 =
02:17:02 1.4</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier =
New">--------------------------</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Patching file webtraf.h using =
Plan A...</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Hunk #1 failed at 30.</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Hunk #2 failed at 59.</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Hunk #3 failed at 85.</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">Hunk #4 failed at 146.</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">4 out of 4 hunks failed--saving =
rejects to webtraf.h.rej</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Courier New">done</FONT>
</P>
<P><FONT SIZE=3D2 FACE=3D"Arial">I tried several ways (parameters =
-u....) but it didn't work. Actually I could use patch command on my =
machine to patch files from NS when I downloaded NS. I am wondering if =
there is any change to the way you write patch files? Or I need to =
update my patch exe?</FONT></P>
<P><FONT SIZE=3D2 FACE=3D"Arial">Thanks,</FONT>
<BR><FONT SIZE=3D2 FACE=3D"Arial">Huiwen </FONT>
</P>
</BODY>
</HTML>
------_=_NextPart_001_01BF8A17.F90AD1E0--