http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5327 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |paul.poulain@biblibre.com --- Comment #20 from Paul Poulain <paul.poulain@biblibre.com> 2011-12-06 18:43:30 UTC --- Chris-es, I tried to apply those patches on the branch 5327, but one of them does not apply anymore: Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm Apply? [yn] y Applying: Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm fatal: sha1 information is lacking or useless (t/Boolean.t). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm 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/Bug-5327-Unit-tests-for-C4ExteralBakerTaylorpm-gQ0UGT.patch Could you rebase against the 5327 branch and update the patch please ? -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.