http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10758
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #54 from Paola Rossi <[email protected]> --- Kind Mr. Mathieu Saby, I'm in doubt that the patch "Show..." that you filed on Aug the 6-th may not be the right one. The date inside the "Show ..." patch is : Date: Fri, 4 Apr 2014 09:36:52 +0200 and the patch is about 3.17.00.008 changing updatedatabase.pl . Could you please verify? Thanks in advance. Anyway today the patch doesn't apply [against master 3.17.00.013] : Applying: Bug 10758 - Show bibliographic information of deleted records in acquisitions Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 10758 - Show bibliographic information of deleted records in acquisitions So I pass the patch to "Patch doesn't apply" status. -- 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/
