[Koha-bugs] [Bug 7683] statistic wizard: cataloging

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7683

Koha Team AMU <koha.aixmarseille at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #75 from Koha Team AMU <koha.aixmarseille at gmail.com> ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 7683:
<h1>Something went wrong !</h1>Applying: Bug 7683: Cataloguing statistics
wizard improvements
Auto packing the repository for optimum performance. You may also
run git gc manually. See git help gc for more information.
Applying: Bug 7683 [Follow-up] Move unit tests in t/db_dependent/Biblio.t
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Removing t/Biblio_GetMarcSubfieldStructureFromKohaField.t
Auto-merging t/db_dependent/Biblio.t
CONFLICT (content): Merge conflict in t/db_dependent/Biblio.t
Failed to merge in the changes.
Patch failed at 0001 Bug 7683 [Follow-up] Move unit tests in
t/db_dependent/Biblio.t
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.
Bug 7683 - statistic wizard: cataloging

26678 - Bug 7683: Cataloguing statistics wizard improvements
26679 - Bug 7683 [Follow-up] Move unit tests in t/db_dependent/Biblio.t
26680 - Bug 7683: Remove use of items.statisticvalue and DHTMLcalendar()
26681 - Bug 7683: Remove dead code about dewey and lccn filters
26682 - Bug 7683: Fix a shift in date filter indexes

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
tmpBug-7683-Follow-up-Move-unit-tests-in-tdbdependent-kzhmvJ.patch .

-- 
You are receiving this mail because:
You are watching all bug changes.