https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39369
Emmanuel Bétemps <e.bete...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |e.bete...@gmail.com
--- Comment #3 from Emmanuel Bétemps <e.bete...@gmail.com> ---
Hi,
7th step did'nt go well
Using index info to reconstruct a base tree...
M Koha/Patron/Discharge.pm
M installer/data/mysql/kohastructure.sql
M koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
M members/discharge.pl
M opac/opac-reserve.pl
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
CONFLICT (add/add): Merge conflict in
installer/data/mysql/atomicupdate/bug_37344.pl
Auto-merging installer/data/mysql/atomicupdate/bug_37344.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 37344: Add a real solution for discharge cancellation
[33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m
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-37344-Add-a-real-solution-for-discharge-cancel-i1tqnky4.patch
Cannot apply cleanly patches from bug 37344. Everything will be left dirty.
git bz apply --continue will not continue the process if patches from other bug
reports need to be applied.
DEV atomic update
/kohadevbox/koha/installer/data/mysql/atomicupdate/bug_37344.pl [13:43:43]
[31mERROR: {UNKNOWN}: Can't use an undefined value as a subroutine
reference at /kohadevbox/koha/C4/Installer.pm line 769. at
/kohadevbox/koha/C4/Installer.pm line 771
[0m
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://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/
