[Top][All Lists]

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

Re: [bug-patch] Problem in applying patches

From: Andreas Gruenbacher
Subject: Re: [bug-patch] Problem in applying patches
Date: Tue, 29 Mar 2011 23:15:13 +0200
User-agent: KMail/1.13.5 (Linux/; KDE/4.4.4; x86_64; ; )

On Tuesday 29 March 2011 17:00:33 Usama Munir Dar wrote:
> Hi All,
> i have a problem patching several diff files, and to my eyes, they look
> correct and should work, but i keep getting the hunk failed error.

The problem is keyword substitution.  Patch doesn't know that you don't care 
about differences in lines like:

 * @version $Revision$ $Date: 2008/02/16 09:24:25 $

You can either fix those lines up or use patch's --merge option which is more 
forgiving.  With the --merge option, make sure to clean up any conflict 
markers that patch inserts if it detects conflicts (<<< ||| === >>>).

Alternatively, use the merge command of cvs/svn.  Or even better, turn off 
keyword substitution; it's a useless and harmful feature, anyway.


reply via email to

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