https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30295
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #52 from David Nind <[email protected]> --- Patches no longer apply - getting a sha1/fake ancestor error when I try and apply the patches. git bz apply 30295 📋 Bug 30295 - Send a notification when a recall is manually canceled • 193599 - Bug 30295: Use blessed patron to enqueue notice and QA fixes • 193600 - Bug 30295: Add phone transport option • 193601 - Bug 30295: (follow-up) Merge database updates into one file with success messages • 193602 - Bug 30295: (follow-up) Spelling: Update cancelled to canceled • 193603 - Bug 30295: (follow-up) Udpate message_attribute_id • 193604 - Bug 30295: (follow-up) Display messaging preferences in right sequence • 203395 - Bug 30295: Send a notification when a recall is manually cancelled Apply? [(y)es, (n)o, (i)nteractive] y Preparing 7 patch(es): ✓ Prepared 7 patch(es) Applying 7 patch(es): Patch application failed for attachment 193599 - Bug 30295: Use blessed patron to enqueue notice and QA fixes Patches left in /tmp/CgvClpN7e_ for manual application if needed To resolve: 1. Fix conflicts (use 'git mergetool' or edit files manually) 2. Stage resolved files with 'git add' 3. Continue with 'git bz apply --continue' or 'git am --continue' 4. Or skip this patch with 'git bz apply --skip' 5. Or abort with 'git bz apply --abort' Error: Apply failed: Git command (git am -3 /tmp/CgvClpN7e_/0001-193599.patch) failed: error: sha1 information is lacking or useless (Koha/Recall.pm). error: could not build fake ancestor .... -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list -- [email protected] To unsubscribe send an email to [email protected] website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
