https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7910
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #18 from Séverine Queune <[email protected]> --- koha@kohamonodev:/var/repositories/koha$ git bz apply 7910 Bug 7910 Depends on bug 20614 Follow? [(y)es, (n)o] y Bug 20614 - Firefox prevents parent page reload when renewing subscriptions 74509 - Bug 20614: Use GET instead of POST for subscription renewing Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20614: Use GET instead of POST for subscription renewing Bug 7910 - Batch renewal of serials 74540 - Bug 7910: Add the ability to renew several subscriptions at once 74541 - Bug 7910: Give feedack when the subscriptions have been renewed - useless? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7910: Add the ability to renew several subscriptions at once fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7910: Add the ability to renew several subscriptions at once The copy of the patch that failed is found in: /var/repositories/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-7910-Add-the-ability-to-renew-several-subscrip-gRgY9c.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/
