https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16735
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #78 from Alex Buckley <[email protected]> --- I have tried to apply these patches as they are a dependency for the patches on bug 19765 however I have found that the patches attached to this bug report (16735) not longer cleanly apply on an up to date branch. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16735: Remove modules no longer needed Applying: Bug 16735: Remove tables no longer needed Applying: Bug 16735: Clean up sample data Applying: Bug 16735: Migrate library search groups into the new hierarchical groups fatal: sha1 information is lacking or useless (C4/Auth.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 16735: Migrate library search groups into the new hierarchical groups 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-16735-Migrate-library-search-groups-into-the-n-yOLkh7.patch -- 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/
