https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22188
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #12 from Séverine Queune <[email protected]> --- Sorry Aleisha... The sandbox you've requested is not ready. Some problems occurred applying patches from bug 22188: <h1>Something went wrong !</h1>Applying: Bug 22188: Use publication date as numbering pattern Using index info to reconstruct a base tree... M C4/Serials.pm M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt M koha-tmpl/intranet-tmpl/prog/js/subscription-add.js M serials/showpredictionpattern.pl M serials/subscription-add.pl Falling back to patching base and 3-way merge... Auto-merging serials/subscription-add.pl Auto-merging serials/showpredictionpattern.pl Auto-merging koha-tmpl/intranet-tmpl/prog/js/subscription-add.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging C4/Serials.pm Warning: commit message did not conform to UTF-8. You may want to amend it after fixing the message, or set the config variable i18n.commitencoding to the encoding your project uses. Applying: Bug 22188: (follow-up) Introducing dateformat field and other fixes fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt). Patch failed at 0001 Bug 22188: (follow-up) Introducing dateformat field and other fixes The copy of the patch that failed is found in: .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. error: could not build fake ancestor Bug 22188 - Use publication date as numbering pattern 85415 - Bug 22188: Use publication date as numbering pattern 87433 - Bug 22188: (follow-up) Introducing dateformat field and other fixes Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-22188-follow-up-Introducing-dateformat-field-a-vPc2wv.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/
