[Koha-bugs] [Bug 16223] Automatically remove any borrower debarments after a payment

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16223

--- Comment #4 from Lari Taskula <lari.taskula at hypernova.fi> ---
(In reply to Emmi Takkinen from comment #3)
> Tried to test this, got error:
> error: short SHA1 bb92094 is ambiguous
> hint: The candidates are:
> hint:   bb92094b8c blob
> hint:   bb92094f25 blob
> error: sha1 information is lacking or useless
> (t/db_dependent/Patron/Borrower_Debarments.t).
> error: could not build fake ancestor

Do you see this after your error:

> Patch failed at 0001 Bug 16223: Automatically remove any borrower debarments after a payment
> Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem run "git bz apply --continue".
> If you would prefer to skip this patch, instead run "git bz apply --skip".
> To restore the original branch and stop patching run "git bz apply --abort".
> Patch left in /tmp/Bug-16223-Automatically-remove-any-borrower-debarm-EzxzUo.patch

Git fails to merge changes and is unable to continue. You need to continue
manually. 

You can do the following:
1. git apply --reject
/tmp/Bug-16223-Automatically-remove-any-borrower-debarm-EzxzUo.patch
2. It generates .rej file for every original file that failed, e.g.
C4/Accounts.pm.rej
3. In this .rej file you can see the changes that are not yet applied
4. Merge the changes manually (by copypasting the lines to appropriate
locations, if they are still valid)

-- 
You are receiving this mail because:
You are watching all bug changes.