[Koha-bugs] [Bug 25261] Multiple parts handling - confirmation alert

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #114 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 25261: Add system preference
Using index info to reconstruct a base tree...
M       installer/data/mysql/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/sysprefs.sql
Applying: Bug 25261: Require confirmation of multiple parts items
Applying: Bug 25261: Checkout confirmation depending on syspref
Applying: Bug 25261: (follow-up) Rename CircConfirmParts to
CircConfirmItemParts
error: sha1 information is lacking or useless (circ/returns.pl).
error: could not build fake ancestor
Patch failed at 0001 Bug 25261: (follow-up) Rename CircConfirmParts to
CircConfirmItemParts
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".
Patch left in
/tmp/Bug-25261-follow-up-Rename-CircConfirmParts-to-Cir-9FLtrb.patch

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