http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11879
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #5 from Magnus Enger <[email protected]> --- The second patch (from Kyle) has a problem: $ git bz apply 11879 Bug 11879 - Add a new borrower field : main contact method. 25922 - New version of the patch. Rebase on current master. 25941 - Bug 11879 [QA Followup] - Fix patch to follow modern coding guidelines Apply? [(y)es, (n)o, (i)nteractive] y Applying: Add the "Main contact method" field in borrower informations. Applying: Bug 11879 [QA Followup] - Fix patch to follow modern coding guidelines fatal: sha1 information is lacking or useless (installer/data/mysql/updatedatabase.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11879 [QA Followup] - Fix patch to follow modern coding guidelines The copy of the patch that failed is found in: /home/magnus/scripts/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-11879-QA-Followup---Fix-patch-to-follow-modern-D5v_Ji.patch -- You are receiving this mail because: You are the assignee for the bug. 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/
