https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22632
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #50 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22632: Add logging of merged patrons Applying: Bug 22632: adding of the rescearch of merge in the log viewer Applying: Bug 22632: Unit Testing of patch 22632 Applying: Bug 22632: (follow-up) Use PATRON_MERGE as log action Applying: Bug 22632: (follow-up) Perltidy fixes for Koha/Patron.pm Applying: Bug 22632: (follow-up) Apply perltidy fixes and add missing exec flag to Log.t Applying: Bug 22632: (follow-up) Tidy and fix tests error: sha1 information is lacking or useless (Koha/Patron.pm). error: could not build fake ancestor Patch failed at 0001 Bug 22632: (follow-up) Tidy and fix tests hint: Use 'git am --show-current-patch=diff' 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-22632-follow-up-Tidy-and-fix-tests-o_fvd6hr.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/