bug-cvs
[Top][All Lists]
Advanced

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

Re: How-to apply the CVS patch.


From: Derek Robert Price
Subject: Re: How-to apply the CVS patch.
Date: Fri, 27 Jun 2003 10:45:52 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Pephirom, Sack wrote:

"...
(Stripping trailing CRs from patch.)
patching file src/server.c
Hunk #1 FAILED at 5548.
Hunk #1 FAILED at 5688.
2 out of 2 hunks FAILED - saving rejects to file src/server.c.rej

That means some lines have changed since the patch was created and patch doesn't know just how to merge it. You need to knopw how to read a diff, but you can look in that *.rej file and see the portions of the diff that wouldn't apply and attempt to merge them by hand.

Derek

--
               *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
--
I will not instigate revolution.
I will not instigate revolution.
I will not instigate revolution...

         - Bart Simpson on chalkboard, _The Simpsons_







reply via email to

[Prev in Thread] Current Thread [Next in Thread]