[Koha-bugs] [Bug 12896] Move the bookseller-related code into its own module
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Sep 18 11:13:05 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896
Paola Rossi <paola.rossi at cineca.it> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #6 from Paola Rossi <paola.rossi at cineca.it> ---
Thanks, Jonathan.
Today I've tried to apply the patches against master 3.17.00.025
The first patch is 5342.
Applying: Bug 5342: Serial claiming improvements: add a counter
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 5342: Serial claiming improvements: add a counter
I've resolved the conflict about updatedatabase.pl.
Then , being in doubt, I immediately proved all the 5342's *.t.
One error occurred:
prove t/db_dependent/Acquisition/OrderFromSubscription.t
t/db_dependent/Acquisition/OrderFromSubscription.t .. 1/13 # Looks like you
planned 13 tests but ran 12.
t/db_dependent/Acquisition/OrderFromSubscription.t .. Dubious, test returned
255 (wstat 65280, 0xff00)
Failed 1/13 subtests
Test Summary Report
-------------------
t/db_dependent/Acquisition/OrderFromSubscription.t (Wstat: 65280 Tests: 12
Failed: 0)
Non-zero exit status: 255
Parse errors: Bad plan. You planned 13 tests but ran 12.
Files=1, Tests=12, 1 wallclock secs ( 0.00 usr 0.02 sys + 0.84 cusr 0.22
csys = 1.08 CPU)
Result: FAIL
-----------------------------------------------------------------------------
So I pass the patch to "Patch doesn't apply" status.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list