https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22632
--- Comment #46 from David Nind <[email protected]> --- (In reply to Nick Clemens from comment #45) > (In reply to David Nind from comment #43) > > I signed off before seeing comment #36 > > > > What should the status be changed to? Failed QA? > > > Tests should pass now, and tidied - can you confirm tests and sign off David? I'm getting a sha1 fake ancestor error when trying to apply the patches now. git bz apply 22632 Bug 22632 - Add logging of merged patrons 157266 - Bug 22632: Add logging of merged patrons 157267 - Bug 22632: adding of the rescearch of merge in the log viewer 157268 - Bug 22632: Unit Testing of patch 22632 157269 - Bug 22632: (follow-up) Use PATRON_MERGE as log action 157270 - Bug 22632: (follow-up) Perltidy fixes for Koha/Patron.pm 157271 - Bug 22632: (follow-up) Apply perltidy fixes and add missing exec flag to Log.t 157278 - Bug 22632: (follow-up) Tidy and fix tests 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 ..... -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
