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: Brian Murphy
Subject: Re: How-to apply the CVS patch.
Date: Mon, 07 Jul 2003 19:52:14 +0200
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030529

Pephirom, Sack wrote:

After following your direction on how to apply the patch (retrieving
revision 1.74 that you have posted), I'm getting message of:
Patching file src/server.c
Hunk #1 FAILED at 5438.
Hunk #1 FAILED at 5578.

2 out of 2 hunks FAILED - saving rejects to file src/server.c.rej
......
What is the best way to complete this patch?

Sack Pephirom

-----Original Message-----
From: Brian Murphy [mailto:address@hidden
Sent: Monday, June 30, 2003 2:23 PM
To: Pephirom, Sack
Cc: address@hidden
Subject: Re: How-to apply the CVS patch.


Pephirom, Sack wrote:

Thanks Brian! After following your directions on how to apply the CVS
patch,
I'm getting a error message of:
"...
(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

I'm using SuSE Linux 8.2 with KDE 3.1 trying to patch cvs-1.11.6 so I could
enable PAM.



Try the patch I just sent to the list - it should apply cleanly to 1.11.6.

/Brian
This is what I get:

address@hidden:~$ tar -xjvf cvs-1.11.6.tar.bz2
address@hidden:~$ cd cvs-1.11.6
address@hidden:~/cvs-1.11.6$ patch -p0 < ~/cvs/cvs-pam.patch.new
patching file configure.in
Hunk #1 succeeded at 476 (offset -90 lines).
Hunk #2 succeeded at 689 (offset -90 lines).
patching file doc/cvs.texinfo
Hunk #1 succeeded at 2469 (offset -9 lines).
patching file src/server.c
Hunk #1 succeeded at 5407 (offset -18 lines).
Hunk #2 succeeded at 5547 (offset -18 lines).
patching file contrib/pam/cvs.linux
patching file contrib/pam/cvs.solaris
address@hidden:~/cvs-1.11.6$


Are you sure it's 1.11.6 you are patching?

/Brian





reply via email to

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