[imp] Patch command throwing up HUNK errors
Tony Arcus
tony at ai.net.nz
Tue Nov 10 20:58:14 UTC 2009
running
patch -p1 < /var/www/some/dir/horde/patch-gollem-h3-1.1-h3-1.1.1
is now giving me this:
patching file docs/CHANGES
patching file docs/CREDITS
patching file docs/RELEASE_NOTES
patching file js/columnselect.js
patching file js/login.js
patching file js/manager.js
patching file js/popup.js
patching file js/prototype.js
patching file js/selectlist.js
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
patching file js/src/prototype.js
patching file js/tables.js
patching file lib/version.php
patching file locale/hr_HR/help.xml
patching file po/de_DE.po
patching file po/fr_FR.po
patching file po/gollem.pot
patching file po/hr_HR.po
patching file po/pt_BR.po
patching file templates/clipboard/clipboard.html
patching file view.php
Hunk #1 FAILED at 1.
1 out of 2 hunks FAILED -- saving rejects to file view.php.rej
the error report looks like this:
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.
I have been doing these patches for a number of years with out issue,
any ideas?
The problem seems to only be around the comments section at the top of
the file
current 1.1 gollem
cd /var/www/html/horde/gollem
patch -p1 < /var/www/inet/os.progs/horde/patch-gollem-h3-1.1-h3-1.1.1
--
Tony Arcus
Systems and Network Engineer
Access Information Limited
Phone : 06-379-6668
Email : tony at ai.net.nz
This email and any accompanying documentation may contain privileged and
confidential information. If you are not the intended recipient, your use
of the information is strictly prohibited.
----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the imp
mailing list