[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [ns] patch doesn't work



We're using unidiff to make patch file.
I've tried to patch the same file (webtraf.h) with same version(1.3 to
1.4) of yours, and it works fine to me.
Could you try again after downloading the patch file at the below
address?
http://www-mash.cs.berkeley.edu/cgi-bin/cvsweb/ns-2/webcache/webtraf.h?r1=1.3&r2=1.4

- Hyunah


> 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