http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5339
Paul Poulain <paul.poul...@biblibre.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Patch doesn't apply |Needs Signoff
--- Comment #27 from Paul Poulain <paul.poul...@biblibre.com> ---
(In reply to comment #26)
> Something went wrong !
> Applying: Bug 5339: Invoices management improvement
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging installer/data/mysql/kohastructure.sql
> Auto-merging installer/data/mysql/updatedatabase.pl
> CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
> Failed to merge in the changes.
> Patch failed at 0001 Bug 5339: Invoices management improvement
When a patch has a merge conflict on update database, and is tested with the
sandbox system, it must not be set to "does not apply".
Just report the problem on the entry, saying you've tried to test it with
sandboxes, and it is not possible.
The patch will have to be tested manually
So... switching back to "needs signoff"
--
You are receiving this mail because:
You are the QA Contact for the bug.
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/
