http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3966
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #26 from Nicole C. Engard <[email protected]> --- patch Apply? [yn] y Applying: bug_3966: Update items on receive /home/nengard/kohaclone/.git/rebase-apply/patch:456: trailing whitespace. /home/nengard/kohaclone/.git/rebase-apply/patch:586: trailing whitespace. <input type="hidden" name="moditem" value="" /> /home/nengard/kohaclone/.git/rebase-apply/patch:735: trailing whitespace. cmp_ok($item->{biblionumber}, '==', $bibnum, "new item is linked to correct biblionumber"); /home/nengard/kohaclone/.git/rebase-apply/patch:736: trailing whitespace. cmp_ok($item->{biblioitemnumber}, '==', $bibitemnum, "new item is linked to correct biblioitemnumber"); error: patch failed: C4/Items.pm:2714 error: C4/Items.pm: patch does not apply /home/nengard/kohaclone/.git/rebase-apply/patch:401: new blank line at EOF. + error: patch failed: acqui/orderreceive.pl:116 error: acqui/orderreceive.pl: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt:49 error: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt: patch does not apply Patch failed at 0001 bug_3966: Update items on receive When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/patch-PSHSnO.patch nengard@kohavm:~/kohaclone$ -- You are receiving this mail because: You are the QA Contact for the bug. 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/
