[Koha-bugs] [Bug 7957] Routing lists: manage several routing list for each subscription, and export them as CSV
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Wed Sep 18 13:07:57 CEST 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7957
I'm just a bot <gitbot at bugs.koha-community.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |gitbot at bugs.koha-community.
| |org
--- Comment #14 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 7957: Routing lists enhancements
Using index info to reconstruct a base tree...
M C4/Items.pm
M C4/Serials.pm
M installer/data/mysql/kohastructure.sql
M installer/data/mysql/updatedatabase.pl
M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
M serials/member-search.pl
M serials/routing-preview.pl
M serials/serials-collection.pl
M serials/serials-search.pl
M serials/subscription-detail.pl
A t/db_dependent/lib/KohaTest/Serials.pm
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): t/db_dependent/lib/KohaTest/Serials.pm deleted in
HEAD and modified in Bug 7957: Routing lists enhancements. Version Bug 7957:
Routing lists enhancements of t/db_dependent/lib/KohaTest/Serials.pm left in
tree.
Auto-merging serials/subscription-detail.pl
Auto-merging serials/serials-search.pl
Auto-merging serials/serials-collection.pl
Removing serials/routing.pl
CONFLICT (modify/delete): serials/routing-preview.pl deleted in Bug 7957:
Routing lists enhancements and modified in HEAD. Version HEAD of
serials/routing-preview.pl left in tree.
Removing serials/reorder_members.pl
Auto-merging serials/member-search.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
Auto-merging C4/Items.pm
Patch failed at 0001 Bug 7957: Routing lists enhancements
The copy of the patch that failed is found in:
/home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list