This is the jenkins error: pplying patch ccp_plugin.patch patching file src/main.cpp Hunk #1 succeeded at 147 (offset 1 line).
Applying patch workaround_broken_drivers.patch patching file plugins/opengl/src/screen.cpp Hunk #1 succeeded at 43 (offset 6 lines). Hunk #2 FAILED at 289. Hunk #3 succeeded at 913 (offset 84 lines). 1 out of 3 hunks FAILED -- rejects in file plugins/opengl/src/screen.cpp Patch workaround_broken_drivers.patch does not apply (enforce with -f) dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
« Back to merge proposal
This is the jenkins error:
pplying patch ccp_plugin.patch
patching file src/main.cpp
Hunk #1 succeeded at 147 (offset 1 line).
Applying patch workaround_ broken_ drivers. patch opengl/ src/screen. cpp opengl/ src/screen. cpp broken_ drivers. patch does not apply (enforce with -f)
patching file plugins/
Hunk #1 succeeded at 43 (offset 6 lines).
Hunk #2 FAILED at 289.
Hunk #3 succeeded at 913 (offset 84 lines).
1 out of 3 hunks FAILED -- rejects in file plugins/
Patch workaround_
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1