|
Description
Mason James
2018-03-14 01:11:58 UTC
Created attachment 72823 [details] [review] Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files deleted: misc/plack/koha.psgi deleted: misc/plack/plackup.sh Created attachment 72824 [details] [review] Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Attempted to sign off but patch fails to apply. The following is my devbox terminal output: vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files 72824 - Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files fatal: sha1 information is lacking or useless (misc/plack/koha.psgi). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-20393-Remove-redundant-kohapsgi-and-plackupsh--Te2c8M.patch Created attachment 73392 [details] [review] Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Corrected modify/delete conflict. Signed-off-by: David Bourgault <david.bourgault@inlibro.com> (In reply to Dilan Johnpullé from comment #3) > Attempted to sign off but patch fails to apply. The following is my devbox > terminal output: > > vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20393 > Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files > hi Dilan the patch applies ok for me, against commit e5d5038 (bz-20531) i'm guessing your repo wasn't set to the HEAD of the 'master' branch, before applying try the following... $ git fetch origin master $ git reset --hard origin/master then... $ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files 73392 - Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files ..success :0) $ git log --oneline | head -n 1 bb7e1b7 Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files (In reply to David Bourgault from comment #4) > Created attachment 73392 [details] [review] [review] > Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files > > Corrected modify/delete conflict. > > Signed-off-by: David Bourgault <david.bourgault@inlibro.com> ^...setting to signed-off for David :0) Wasn't this meant as a dev script only? Not sure if anyone still uses it. (I would prefer to get rid of them too.) No bugfix btw, trivial enh. Created attachment 75895 [details] [review] Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Signed-off-by: David Bourgault <david.bourgault@inlibro.com> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Created attachment 75896 [details] [review] Bug 20393: (QA follow-up) Remove only occurence of misc/plack/koha.psgi Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Awesome work all! Pushed to master for 18.11 Enhancement, will not be backported to 18.05.x series. |