Error Trying to Patch Bugzilla 5.0.3 to 5.0.4

[Ritchie, Dennis]

When I do a dry run patch ("patch --dry-run -p1 < bugzilla-5.0.3-to-5.0.4.diff") (from /var/www/html/bugzilla) on CentOS 6.6, I get an error

patching file Bugzilla/CGI.pm
patching file Bugzilla/Config.pm
patching file Bugzilla/Constants.pm
patching file Bugzilla/DB/Sqlite.pm
patching file Bugzilla/Install/Filesystem.pm
patching file Bugzilla/Install/Requirements.pm
patching file Bugzilla/JobQueue.pm
patching file Bugzilla/Migrate.pm
patching file Bugzilla/Template.pm
patching file Bugzilla/Util.pm
patching file attachment.cgi
patching file contrib/jb2bz.py
can't find file to patch at input line 630
Perhaps you used the wrong -p or --strip option?

Then it asks me : "File to patch: "

Here are lines 628-635:

diff -urN '--exclude=CVS' '--exclude=*.pdf' '--exclude=.bzr' '--exclude=.git' bugzilla-5.0.3/docs/en/html/.buildinfo bugzilla-5.0.4/docs/en/html/.buildinfo
--- bugzilla-5.0.3/docs/en/html/.buildinfo 2018-02-20 19:41:13.516887339 +0000
+++ bugzilla-5.0.4/docs/en/html/.buildinfo 2018-02-20 19:41:34.495902921 +0000
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 994516dc7f842d278b9da6a00b8bc75e
+config: a8b5a6fed0bec34945a7351bcc28abf7
tags: 645f666f9bcd5a90fca523b33c5a78b7


Am I doing the patch command wrong?


I know that I can just use GIT and migrate all of my changes, but I have customized a lot of templates.


Thank You

Dennis Ritchie

[Thorsten Schöning]

Guten Tag Ritchie, Dennis,

Post by Ritchie, Dennis
can't find file to patch at input line 630

[...]

Post by Ritchie, Dennis
--- bugzilla-5.0.3/docs/en/html/.buildinfo 2018-02-20 19:41:13.516887339 +0000
+++ bugzilla-5.0.4/docs/en/html/.buildinfo 2018-02-20 19:41:34.495902921 +0000

Are those files available in your installation? They aren't in mine
and don't seem to be in the official repo:

https://github.com/bugzilla/bugzilla/tree/5.0/docs/en

I guess they need to be generated locally and have been during
creating the patch file. Which might or might not be considered as a
bug for the patch file itself, I would expect it to only consider
vanilla GIT-repo-contents.

Anyway, you can try simply removing those parts from the patch file.

Post by Ritchie, Dennis
I know that I can just use GIT and migrate all of my changes, but I
have customized a lot of templates.

So what problem do you actually see? Clone the repo and create your
own new branch based on tag release-5.0.3, to which you apply your
customizations. Afterwards merge "release-5.0-stable" into that and
deal with the conflicts, which you need to do with using a pacth file
anyway as well. I simply use some branch name like "local_install".

Mit freundlichen Grüßen,

Thorsten Schöning
--
Thorsten Schöning E-Mail: ***@AM-SoFT.de
AM-SoFT IT-Systeme http://www.AM-SoFT.de/

Telefon...........05151- 9468- 55
Fax...............05151- 9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow