https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14957
delaye <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m --- Comment #14 from delaye <[email protected]> --- i can't test the patch with a sandbox biblibre i have this message The sandbox you've requested is not ready. Some problems occurred applying patches from bug 14957: <h1>Something went wrong !</h1>Applying: Bug 14957: Database changes Applying: Bug 14957: Add filters to relevant scripts .git/rebase-apply/patch:14: trailing whitespace. } .git/rebase-apply/patch:16: trailing whitespace. ModBiblioframework( , ); warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... M cataloguing/addbiblio.pl M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt M misc/migration_tools/bulkmarcimport.pl M tools/batch_record_modification.pl .git/rebase-apply/patch:14: trailing whitespace. } .git/rebase-apply/patch:16: trailing whitespace. ModBiblioframework( , ); warning: 2 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging tools/batch_record_modification.pl CONFLICT (content): Merge conflict in tools/batch_record_modification.pl Auto-merging misc/migration_tools/bulkmarcimport.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging cataloguing/addbiblio.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 14957: Add filters to relevant scripts The copy of the patch that failed is found in: .git/rebase-apply/patch 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 14957 - Write protecting MARC fields based on source of import 44057 - Bug 14957: Database changes 44058 - Bug 14957: Add filters to relevant scripts 51723 - Bug 14957: Rule based permission for MARC fields 51724 - Bug 14957: Correct parameters for TransformMarcToKoha Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-14957-Add-filters-to-relevant-scripts-7vvvqA.patch . -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
