[imp] Patch command throwing up HUNK errors

[Michael M Slusarz]

Quoting Tony Arcus <tony at ai.net.nz>:

> running
>
> patch -p1 < /var/www/some/dir/horde/patch-gollem-h3-1.1-h3-1.1.1

[snip]

> patching file js/src/manager.js
> Hunk #1 FAILED at 1.
> 1 out of 4 hunks FAILED -- saving rejects to file js/src/manager.js.rej

[snip]

> cat js/src/manager.js.rej
> ***************
> *** 1,7 ****
>   /**
>    * Provides the javascript for the manager.php script.
>    *
> -  * $Horde: gollem/js/src/manager.js,v 1.11.2.1 2008-10-09 20:54:41  
> jan Exp $
>    *
>    * See the enclosed file COPYING for license information (LGPL). If you
>    * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
> --- 1,7 ----
>   /**
>    * Provides the javascript for the manager.php script.
>    *
> +  * $Horde: gollem/js/src/manager.js,v 1.11.2.2 2009-05-19 14:41:27  
> slusarz Exp $
>    *
>    * See the enclosed file COPYING for license information (LGPL). If you
>    * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.

You can safely ignore.  For whatever reason, patch is not handling the  
version string change eloquently (there might be too much contextual  
difference between the strings on the same line).  But it is in a PHP  
comment, so it won't affect run-time code.

michael

-- 
___________________________________
Michael Slusarz [slusarz at horde.org]