http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8236
--- Comment #25 from Koha Team Lyon 3 <k...@univ-lyon3.fr> --- I don't understand : I tried today on a brand new master and except as for the updatedatabase.pl file that blocks as usual when somebody adds a new syspref or something else in sql, every file is applying cleanly. I did that on top of today's master : First apply the tabulations patch : git am 0001-Bug-9098-Replace-tabulations-by-spaces.. then : git apply --reject 0001-Bug-8236-Block-renewing-for... and got this : Applied patch C4/Circulation.pm cleanly. Applied patch C4/ILSDI/Services.pm cleanly. Applied patch circ/circulation.pl cleanly. Applied patch installer/data/mysql/sysprefs.sql cleanly. Applying patch installer/data/mysql/updatedatabase.pl with 1 rejects... Rejected hunk #1. Applied patch koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref cleanly. Applied patch koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt cleanly. Applied patch koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt cleanly. Applied patch koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt cleanly. Applied patch members/moremember.pl cleanly. Applied patch opac/opac-user.pl cleanly -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/