https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38687
Janne Seppänen <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Janne Seppänen <[email protected]> --- Tried testing on the ByWater Solutions sandbox, but applying the patch ends up in error: Bug 38687 - Batch extend due dates should be called Batch modify due dates 176651 - Bug 38687: update "batch modify due dates" and description "Modify the due date checkouts in batch" Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 38687: update "batch modify due dates" and description "Modify the due date checkouts in batch" Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc M koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt M koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 38687: update "batch modify due dates" and description "Modify the due date checkouts in batch" [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-38687-update-batch-modify-due-dates-and-descri-55dxiw_1.patch -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ Koha-bugs mailing list [email protected] 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/
