http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10124
Pierre Angot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #12 from Pierre Angot <[email protected]> --- Sandbox setup by [email protected] with database 2 and bug 10124 on Thu May 30 08:42:02 2013 Something went wrong ! Applying: Bug 10124: Merge GetPendingOrders and SearchOrders routines Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging acqui/orderreceive.pl Auto-merging t/db_dependent/Acquisition.t Applying: Bug 10124: Add basket group name in filters Applying: Bug 10124: Add filters on the pending orders table Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 10124: Add filters on the pending orders table When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 10124 - Pending orders: ergonomic improvement Bug 10124: Merge GetPendingOrders and SearchOrders routines Apply? [yn] Bug 10124: Add basket group name in filters Apply? [yn] Bug 10124: Add filters on the pending orders table Apply? [yn] Patch left in /tmp/Bug-10124-Add-filters-on-the-pending-orders-table-GhyXZs.patch -- 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/
