http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6299
--- Comment #44 from Tomás Cohen Arazi <[email protected]> 2012-02-14 13:28:48 UTC --- (In reply to comment #43) > QA comment: > > Those patches look OK, however, when trying to apply the FR & ES translations, > I get a nasty: > > fatal: sha1 information is lacking or useless > (installer/data/mysql/updatedatabase.pl). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 Bug 6299 - add es-ES > 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". > > (same for FR) > > Any idea why Jared ? There must have been an addition to updatedatabase.pl that makes patches don't apply -- 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. _______________________________________________ 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/
