https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16330
Dilan Johnpullé <di...@calyx.net.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |di...@calyx.net.au --- Comment #60 from Dilan Johnpullé <di...@calyx.net.au> --- Attempted to apply the patch but ran into issues with one of the dependencies. Attempting the test afterwards just results in a lot of ugly error messages. This is the output from git when attempting to apply: vagrant@kohadevbox:kohaclone((af7d618...))$ git bz apply -s 16330 Bug 16330 Depends on bug 19410 Follow? [(y)es, (n)o] y Bug 19410 Depends on bug 19234 Follow? [(y)es, (n)o] y Bug 19234 - Add query parameters handling helpers 69360 - Bug 19234: Unit tests for query parameters handling helpers 69361 - Bug 19234: Add query parameters handling helpers 69362 - Bug 19234: (followup) Make Query plugin available to endpoints Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19234: Unit tests for query parameters handling helpers Applying: Bug 19234: Add query parameters handling helpers Applying: Bug 19234: (followup) Make Query plugin available to endpoints Bug 19410 Depends on bug 19278 Follow? [(y)es, (n)o] y Bug 19278 Depends on bug 19369 Follow? [(y)es, (n)o] y Bug 19369 Depends on bug 19234 Follow? [(y)es, (n)o] y Bug 19234 - Add query parameters handling helpers 69360 - Bug 19234: Unit tests for query parameters handling helpers 69361 - Bug 19234: Add query parameters handling helpers 69362 - Bug 19234: (followup) Make Query plugin available to endpoints Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19234: Unit tests for query parameters handling helpers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 19234: Add query parameters handling helpers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 19234: (followup) Make Query plugin available to endpoints Using index info to reconstruct a base tree... M Koha/REST/V1.pm Falling back to patching base and 3-way merge... No changes -- Patch already applied. Bug 19369 - Add a helper function for translating pagination params into SQL::Abstract 69363 - Bug 19369: Unit tests 69364 - Bug 19369: Add helper function for pagination attributes generation Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19369: Unit tests Applying: Bug 19369: Add helper function for pagination attributes generation Bug 19278 - Add a configurable default page size for endpoints 69365 - Bug 19278: Add RESTdefaultPageSize syspref 69366 - Bug 19278: Unit tests 69367 - Bug 19278: Make the pagination plugin use RESTdefaultPageSize 69368 - Bug 19278: Mention RESTdefaultPageSize in POD Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19278: Add RESTdefaultPageSize syspref Applying: Bug 19278: Unit tests Applying: Bug 19278: Make the pagination plugin use RESTdefaultPageSize Applying: Bug 19278: Mention RESTdefaultPageSize in POD Bug 19410 Depends on bug 19369 Follow? [(y)es, (n)o] y Bug 19369 Depends on bug 19234 Follow? [(y)es, (n)o] y Bug 19234 - Add query parameters handling helpers 69360 - Bug 19234: Unit tests for query parameters handling helpers 69361 - Bug 19234: Add query parameters handling helpers 69362 - Bug 19234: (followup) Make Query plugin available to endpoints Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19234: Unit tests for query parameters handling helpers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 19234: Add query parameters handling helpers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Bug 19234: (followup) Make Query plugin available to endpoints Using index info to reconstruct a base tree... M Koha/REST/V1.pm Falling back to patching base and 3-way merge... No changes -- Patch already applied. Bug 19369 - Add a helper function for translating pagination params into SQL::Abstract 69363 - Bug 19369: Unit tests 69364 - Bug 19369: Add helper function for pagination attributes generation Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19369: Unit tests Using index info to reconstruct a base tree... M t/Koha/REST/Plugin/Pagination.t Falling back to patching base and 3-way merge... Auto-merging t/Koha/REST/Plugin/Pagination.t CONFLICT (content): Merge conflict in t/Koha/REST/Plugin/Pagination.t Failed to merge in the changes. Patch failed at 0001 Bug 19369: Unit tests The copy of the patch that failed is found in: /home/vagrant/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-19369-Unit-tests-aBwR2M.patch Cannot apply cleanly patches from bug 19369. Everything will be left dirty. git bz apply --continue will not continue the process if patches from other bug reports need to be applied. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/