[Koha-bugs] [Bug 15494] Block renewals by arbitrary item values
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun Oct 8 11:51:08 CEST 2017
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15494
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |katrin.fischer at bsz-bw.de
--- Comment #5 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Code looks good, but there is a bigger conflict in the test file I am not sure
about, can you please rebase?
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 15494 - Unit tests
Using index info to reconstruct a base tree...
M t/db_dependent/Circulation.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Circulation.t
CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15494 - Unit tests
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-15494---Unit-tests-pu3VeI.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list