http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15599
M. Tompsett <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #5 from M. Tompsett <[email protected]> --- Can't duplicate problem as described in test plan. mtompset@debian:~/kohaclone$ git checkout -b bug_15599 origin/master Branch bug_15599 set up to track remote branch master from origin. Switched to a new branch 'bug_15599' mtompset@debian:~/kohaclone$ prove t/db_dependent/Circulation/Returns.t t/db_dependent/Circulation/Returns.t .. Subroutine C4::Context::userenv redefined at t/db_dependent/Circulation/Returns.t line 15. t/db_dependent/Circulation/Returns.t .. ok All tests successful. Files=1, Tests=2, 1 wallclock secs ( 0.02 usr 0.00 sys + 0.90 cusr 0.04 csys = 0.96 CPU) Result: PASS mtompset@debian:~/kohaclone$ prove t/db_dependent/Items.t t/db_dependent/Items.t .. ok All tests successful. Files=1, Tests=9, 2 wallclock secs ( 0.02 usr 0.00 sys + 1.16 cusr 0.03 csys = 1.21 CPU) Result: PASS Patch does not apply. mtompset@debian:~/kohaclone$ git bz apply 15599 Bug 15599 - Unit tests output warnings 46869 - Bug 15599 - Unit tests output warnings Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 15599 - Unit tests output warnings fatal: sha1 information is lacking or useless (t/db_dependent/Circulation/Returns.t). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15599 - Unit tests output warnings The copy of the patch that failed is found in: /home/mtompset/kohaclone/.git/rebase-apply/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-15599---Unit-tests-output-warnings-lEGWsI.patch mtompset@debian:~/kohaclone$ NOTE: I read the patch, and it looks like an improvement to me, but can't sign off. Please rebase first. -- 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/
