https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17505
Jiri Kozlovsky <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Jiri Kozlovsky <[email protected]> --- (In reply to Lari Taskula from comment #8) > Depends on Bug 18137 and 17499. These Bugs will conflict in > Koha/Exceptions.pm but should be easily fixable. I somehow cannot apply the patch, it shows following error: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17505: REST API route for messaging preferences fatal: sha1 information is lacking or useless (api/v1/swagger/definitions.json). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 17505: REST API route for messaging preferences 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-17505-REST-API-route-for-messaging-preferences-QwXcYD.patch When trying to apply it manually using 'git apply /home/vagrant/kohaclone/.git/rebase-apply/patch -3 -v', it also shows an error: error: while searching for: "holds": { "$ref": "definitions/holds.json" }, "patron": { "$ref": "definitions/patron.json" } error: patch failed: api/v1/swagger/definitions.json:11 error: repository lacks the necessary blob to fall back on 3-way merge. error: api/v1/swagger/definitions.json: patch does not apply ... Didn't you forgot to add another dependency? I've applied both 17499 & 18137 on top of current master. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
