[Koha-bugs] [Bug 17656] Irregularities in serial prediction pattern are planned only for current subscription

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17656

Arthur Suzuki <arthur.suzuki at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |arthur.suzuki at biblibre.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #203 from Arthur Suzuki <arthur.suzuki at biblibre.com> ---
Patch doesn't apply :

<pre>
root at kohadevbox:koha(bz17656)$ git bz apply 17656

Bug 17656 - Irregularities in serial prediction pattern are planned only for
current subscription

128498 - Bug 17656: Keep irregularities during subscription renewals
128499 - Bug 17656: (follow-up) Add missing filters
128500 - Bug 17656: [DO NOT PUSH] provide schema file
128501 - Bug 17656: [DO NOT PUSH] provide css file
128502 - Bug 17656: QA warnings fixes
128503 - Bug 17656: use Koha::Subscription->startdate instead of
Koha::Subscriptions
128504 - Bug 17656: More meaningful messages in prediction pattern table

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 17656: Keep irregularities during subscription renewals
Using index info to reconstruct a base tree...
M       C4/Serials.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
M       koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
M       serials/subscription-add.pl
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-add.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 17656: Keep irregularities during subscription
renewals
hint: Use 'git am --show-current-patch=diff' to see the failed 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-17656-Keep-irregularities-during-subscription--JneHV9.patch

</pre>

-- 
You are receiving this mail because:
You are watching all bug changes.