https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19165
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |In Discussion --- Comment #5 from Alex Buckley <[email protected]> --- Sorry Christophe unfortunately it still cannot apply correctly on up to date master branch. Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices 67078 - new rebased patch Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices fatal: sha1 information is lacking or useless (acqui/addorderiso2709.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 19165 - When adding from a staged file order discounts are not passed into C4::Acquisitions::populate_order_with_prices 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/new-rebased-patch-iCks9Z.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/
