<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Nov 3, 2016, at 9:29 AM, Christopher Larson <<a href="mailto:clarson@kergoth.com" class="">clarson@kergoth.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><div class="gmail_extra"><br class=""><div class="gmail_quote">On Thu, Nov 3, 2016 at 9:01 AM, Alexander Kanavin <span dir="ltr" class=""><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank" class="">alexander.kanavin@linux.intel.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div id=":kb" class="a3s aXjCH m1582afc939339589">it would be very useful if devtool offered support for rebasing source patches when they fail to apply, but currently there does not seem to be any such feature:<br class="">
<br class="">
ak@kanavin-desktop:~/developme<wbr class="">nt/poky/build$ devtool modify libksba<br class="">
Parsing recipes..done.<br class="">
NOTE: Fetching libksba...<br class="">
NOTE: Unpacking...<br class="">
NOTE: Patching...<br class="">
ERROR: Applying '<a href="http://ksba-add-pkgconfig-support.pa/" class="">ksba-add-pkgconfig-support.pa</a><wbr class="">tch' failed:<br class="">
checking file Makefile.am<br class="">
Hunk #1 FAILED at 21.<br class="">
1 out of 1 hunk FAILED<br class="">
checking file <a href="http://configure.ac/" rel="noreferrer" target="_blank" class="">configure.ac</a><br class="">
Hunk #1 succeeded at 414 (offset 14 lines).<br class="">
checking file <a href="http://ksba.pc.in/" rel="noreferrer" target="_blank" class="">ksba.pc.in</a><br class="">
checking file src/ksba.m4<br class="">
ERROR: Function failed: patch_do_patch<br class="">
ak@kanavin-desktop:~/developme<wbr class="">nt/poky/build$<br class="">
<br class="">
What devtool could do here is apply the patches that can be applied and then partially apply the patches that fail. Then give the developer some kind of UI for dealing with the rejected hunks (which typically means finding the place in the target file where the changes should go and then manually editing them in, while looking at the original patch).<br class="">
<br class="">
Without this feature devtool is half as useful as it could be particularly for recipe version updates.</div></blockquote></div><div class="gmail_extra"><br class=""></div>That would be useful, indeed.</div><div class="gmail_extra"><br class="">git already provides such a UI, afaik devtool just needs to use git-am to apply the patches, ideally passing -3 to it, and let the user use git am to resolve and continue applying patches.<br class=""></div></div></div></blockquote><div><br class=""></div><div>this seems good. Although, I have seen that all patches are not git am applicable, then I use git apply, something even that does not work, then third option is</div><div>to use patch < patch and this works if it does not work then patch needs manual work.</div><br class=""><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class="gmail_extra">-- <br class=""><div class="gmail_signature" data-smartmail="gmail_signature">Christopher Larson<br class="">clarson at kergoth dot com<br class="">Founder - BitBake, OpenEmbedded, OpenZaurus<br class="">Maintainer - Tslib<br class="">Senior Software Engineer, Mentor Graphics</div>
</div></div>
-- <br class="">_______________________________________________<br class="">Openembedded-core mailing list<br class=""><a href="mailto:Openembedded-core@lists.openembedded.org" class="">Openembedded-core@lists.openembedded.org</a><br class="">http://lists.openembedded.org/mailman/listinfo/openembedded-core<br class=""></div></blockquote></div><br class=""></body></html>