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 #11 from Mason James <[email protected]> --- (In reply to Mason James from comment #10) > (In reply to Jonathan Druart from comment #8) > > (In reply to Mason James from comment #7) > > > 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? > > > > Everything is applying ok for me, please check the dependencies. > > afaik (In reply to Jonathan Druart from comment #8) > > (In reply to Mason James from comment #7) > > > 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? > > > > Everything is applying ok for me, please check the dependencies. > > i have all listed dependencies applied on commit 56da7be (10455 17193 17197) > > the patch still fails for me here's the transcript... mason@xen1:~/g/k/Koha$ git log --oneline' 56da7be Bug 17352 - Patron search type is hard coded to 'contain' in circ/circulation.pl 5eb4b06 Bug 16273 - DBRev 16.06.00.031 3d4dc58 Bug 16273: Add the ability not to display the login details for newly registered patrons 8d0b412 Bug 16273: Add the new pref PatronSelfRegistrationPrefillForm d85e80b Bug 17301: Follow-up - Standardize headings mason@xen1:~/g/k/Koha$ git bz apply 10455 Bug 10455 - remove redundant 'biblioitems.marc' field 55844 - Bug 10455: Remove biblioitems.marc - DB changes 55845 - Bug 10455: Remove biblioitems.marc 55846 - Bug 10455: Remove biblioitems.marc - rm MARC21_parse_test.pl 55847 - Bug 10455: Remove biblioitems.marc - update delete_records_via_leader.pl 55848 - Bug 10455: (follow-up) Remove biblioitems.marc 55849 - Bug 10455: (follow-up 2) Remove biblioitems.marc 55850 - Bug 10455: (follow-up 3) Remove biblioitems.marc 55851 - Bug 10455: Remove MARC21_utf8_flag_fix.pl 55852 - Bug 10455: Fix tests 55853 - Bug 10455 (QA Followup) Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10455: Remove biblioitems.marc - DB changes Applying: Bug 10455: Remove biblioitems.marc Applying: Bug 10455: Remove biblioitems.marc - rm MARC21_parse_test.pl Applying: Bug 10455: Remove biblioitems.marc - update delete_records_via_leader.pl Applying: Bug 10455: (follow-up) Remove biblioitems.marc Applying: Bug 10455: (follow-up 2) Remove biblioitems.marc Applying: Bug 10455: (follow-up 3) Remove biblioitems.marc Applying: Bug 10455: Remove MARC21_utf8_flag_fix.pl Applying: Bug 10455: Fix tests Applying: Bug 10455 (QA Followup) mason@xen1:~/g/k/Koha$ mason@xen1:~/g/k/Koha$ git bz apply 17193 Bug 17193 - C4::Search::SearchAcquisitions is not used 54962 - [PASSED QA] Bug 17193: Remove C4::Search::SearchAcquisitions Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17193: Remove C4::Search::SearchAcquisitions Using index info to reconstruct a base tree... M C4/Search.pm Falling back to patching base and 3-way merge... No changes -- Patch already applied. mason@xen1:~/g/k/Koha$ git bz apply 17197 Bug 17197 - misc/batchupdateISBNs.pl is certainly no longer in use 55478 - [PASSED QA] Bug 17197: Remove misc/batchupdateISBNs.pl Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17197: Remove misc/batchupdateISBNs.pl Using index info to reconstruct a base tree... A misc/batchupdateISBNs.pl Falling back to patching base and 3-way merge... No changes -- Patch already applied. mason@xen1:~/g/k/Koha$ mason@xen1:~/g/k/Koha$ git log --oneline' 4f6b1ee Bug 10455 (QA Followup) 98af430 Bug 10455: Fix tests a5e6f98 Bug 10455: Remove MARC21_utf8_flag_fix.pl fbb280d Bug 10455: (follow-up 3) Remove biblioitems.marc 81a0fb2 Bug 10455: (follow-up 2) Remove biblioitems.marc 4e3520d Bug 10455: (follow-up) Remove biblioitems.marc 339d2bc Bug 10455: Remove biblioitems.marc - update delete_records_via_leader.pl d572063 Bug 10455: Remove biblioitems.marc - rm MARC21_parse_test.pl dccc79a Bug 10455: Remove biblioitems.marc 558f6b1 Bug 10455: Remove biblioitems.marc - DB changes 56da7be Bug 17352 - Patron search type is hard coded to 'contain' in circ/circulation.pl 5eb4b06 Bug 16273 - DBRev 16.06.00.031 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-HBdRv1.patch mason@xen1:~/g/k/Koha$ git apply /tmp/Bug-17196-Move-marcxml-out-of-the-biblioitems-tabl-HBdRv1.patch error: patch failed: C4/Biblio.pm:42 error: C4/Biblio.pm: patch does not apply error: patch failed: C4/ILSDI/Services.pm:406 error: C4/ILSDI/Services.pm: patch does not apply error: patch failed: misc/cronjobs/delete_records_via_leader.pl:68 error: misc/cronjobs/delete_records_via_leader.pl: patch does not apply -- 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/
