[Koha-bugs] [Bug 20393] Remove redundant 'koha.psgi' and 'plackup.sh' files

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Mon Mar 26 01:22:27 CEST 2018


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393

Dilan Johnpullé <dilan at calyx.net.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dilan at calyx.net.au
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #3 from Dilan Johnpullé <dilan at calyx.net.au> ---
Attempted to sign off but patch fails to apply. The following is my devbox
terminal output:

vagrant at 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

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.


More information about the Koha-bugs mailing list