[Koha-bugs] [Bug 19278] Add a configurable default page size for endpoints
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Oct 4 21:41:04 CEST 2017
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19278
Alex Buckley <alexbuckley at catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #10 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Tomas
Can you please rebase this patch against master because when I applied the
patches attached to this bug report (after applying the dependencies) I got the
following merge error:
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19278: Add RESTdefaultPageSize syspref
Applying: Bug 19278: Unit tests
fatal: sha1 information is lacking or useless
(t/Koha/REST/Plugin/Pagination.t).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 19278: Unit tests
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-19278-Unit-tests-3gVPjM.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list