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

Alex Buckley <alexbuck...@catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #12 from Alex Buckley <alexbuck...@catalyst.net.nz> ---
Hi Tomas

It is still failing when applying the patches (specifically it is failing when
applying the Unit Tests patch). I've applied the  dependencies listed on the
patch as of 5 minutes ago. Please let me know if I am missing something?

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-XOrn2r.patch

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/

Reply via email to