https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30708
--- Comment #55 from Heather <[email protected]> --- Hi, Amaury-- Today I'm getting a different problem--there is no "PreservationModule" syspref--no sysprefs with *preservation* in them anywhere. When I try to apply this patch, I get this text: ---Begin quote: Bug 30708 Depends on bug 34054 (Signed Off) Follow? [(y)es, (n)o] Bug 34054 - Allow to embed biblio on GET /items 153819 - Bug 34054: Add tests 153820 - Bug 34054: Allow to embed biblio on GET /items Apply? [(y)es, (n)o, (i)nteractive] fatal: previous rebase directory .git/rebase-apply still exists but mbox given. Patch left in /tmp/Bug-34054-Add-tests-eehavq7y.patch Cannot apply cleanly patches from bug 34054. Everything will be left dirty. git bz apply --continue will not continue the process if patches from other bug reports need to be applied. {UNKNOWN}: Version control conflict marker at /kohadevbox/koha/Koha/Schema/Result/Item.pm line 961, near "<<<<<<<" Version control conflict marker at /kohadevbox/koha/Koha/Schema/Result/Item.pm line 964, near "=======" Version control conflict marker at /kohadevbox/koha/Koha/Schema/Result/Item.pm line 967, near ">>>>>>>" BEGIN not safe after errors--compilation aborted at /kohadevbox/koha/Koha/Schema/Result/Item.pm line 1015. Compilation failed in require at /usr/share/perl5/Class/C3/Componentised.pm line 146. at /usr/share/perl5/Class/C3/Componentised.pm line 151 Compilation failed in require at /kohadevbox/koha/C4/Installer.pm line 30. BEGIN failed--compilation aborted at /kohadevbox/koha/C4/Installer.pm line 30. Compilation failed in require at koha/installer/data/mysql/updatedatabase.pl line 40. BEGIN failed--compilation aborted at koha/installer/data/mysql/updatedatabase.pl line 40. ---End quote So perhaps there's a problem applying the patch to my sandbox? (My sandbox is here, http://sandboxes.ptfs-europe.co.uk/ ) Thank you for your help! --h2 -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ 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/
