https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17855
M. Tompsett <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #15 from M. Tompsett <[email protected]> --- I was hoping to test this, but got: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 17855- In web installer step 3, automatically selected default data values are successfully being inserted into the database. Applying: Bug 17855 - As with the last patch the updated web installers step 3 is showing bulletpoints for default data values which stops the user being able to unselect data neccisary to use Koha. Applying: Bug 17855 - Implemented basic and advanced setup modes in the web installer avalable on the MARC flavour selection page of step 3. Applying: Bug 17855 - Finished front end of onboarding tool which user is redirected to (after authentication) after finishing the web installer. /home/vagrant/kohaclone/.git/rebase-apply/patch:391: trailing whitespace. /home/vagrant/kohaclone/.git/rebase-apply/patch:402: trailing whitespace. <div> /home/vagrant/kohaclone/.git/rebase-apply/patch:410: trailing whitespace. /home/vagrant/kohaclone/.git/rebase-apply/patch:416: trailing whitespace. [% ELSE %] /home/vagrant/kohaclone/.git/rebase-apply/patch:470: trailing whitespace. [% END %] fatal: sha1 information is lacking or useless (installer/onboarding.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 17855 - Finished front end of onboarding tool which user is redirected to (after authentication) after finishing the web installer. 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-17855---Finished-front-end-of-onboarding-tool--YKACAI.patch Perhaps you have forgotten to obsolete older patches on this bug as well? Click Details, Edit details, check obsolete, and everything else is hopefully obvious. :) -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ 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/
