https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17708
julien.co...@u-psud.fr changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |julien.co...@u-psud.fr
--- Comment #19 from julien.co...@u-psud.fr ---
Some problems occurred applying patches from bug 17708:
<h1>Something went wrong !</h1>Applying: BUG 17708: Added a logaction function
in Addrenewal in order to send renew logs
Using index info to reconstruct a base tree...
M C4/Circulation.pm
M installer/data/mysql/sysprefs.sql
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
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Circulation.pm
Patch failed at 0001 BUG 17708: Added a logaction function in Addrenewal in
order to send renew logs
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: Failed to merge in the changes.
Bug 17708 - Renewal log seems empty
60641 - BUG 17708: Added a logaction function in Addrenewal in order to send
renew logs
61353 - BUG 17708: Manual Merged
Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/BUG-17708-Added-a-logaction-function-in-Addrenewal-4Iph8r.patch .
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
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/
