http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9780
Christophe Croullebois <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |christophe.croullebois@bibl | |ibre.com --- Comment #5 from Christophe Croullebois <[email protected]> --- Hello Mathieu, sry, but : 1° : in your patch you have whitespace errors, not a problem to test but later for QA... I paste the git am message : ================================= Applying: Bug 9780: Alert librarians if a record is used by orders and prevent its suppression /home/christophe/workspace/versions/community/.git/rebase-apply/patch:49: trailing whitespace. WHERE aqorders.biblionumber=? /home/christophe/workspace/versions/community/.git/rebase-apply/patch:89: trailing whitespace. } /home/christophe/workspace/versions/community/.git/rebase-apply/patch:91: trailing whitespace. else { /home/christophe/workspace/versions/community/.git/rebase-apply/patch:95: trailing whitespace. } /home/christophe/workspace/versions/community/.git/rebase-apply/patch:135: trailing whitespace. [% END %] warning: squelched 14 whitespace errors warning: 19 lines add whitespace errors. =================================== 2° : in your patch 2 =================================== Applying: Bug 9780: Don't show comma at the end of the line /home/christophe/workspace/versions/community/.git/rebase-apply/patch:115: trailing whitespace. [%- UNLESS loop.last %],[% END %] error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt:136 error: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt: patch does not apply Patch failed at 0001 Bug 9780: Don't show comma at the end of the line 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". =================================== As I was able to apply the patch1, I am going to test the patch without the follow up, please rebase for the followup thx -- 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/
