https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17196
Mason James <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #7 from Mason James <[email protected]> --- Hi Jonathan I attempted to test this patchset, but I had a big problem trying to 'git bz apply' the 1st patch, on master (0254fd7) 0254fd7 Bug 17135 - DBRev 16.06.00.028 would you take another look at the patchset please? --------------- mason@xen1:~/g/k/Koha$ git bz apply 17196 Bug 17196 - Move marcxml out of the biblioitems table 54910 - Bug 17196: Move marcxml out of the biblioitems table 54911 - Bug 17196: Fix query builder for item search 54912 - Bug 17196: Update misc/maintenance/sanitize_records.pl 54913 - Bug 17196: Update switch_marc21_series_info.pl 54918 - Bug 17196: DB Changes Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17196: Move marcxml out of the biblioitems table fatal: sha1 information is lacking or useless (C4/Biblio.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 17196: Move marcxml out of the biblioitems table The copy of the patch that failed is found in: /home/mason/g/k/Koha/.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-17196-Move-marcxml-out-of-the-biblioitems-tabl-jCnYTS.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/
