<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 3, 2016 at 9:01 AM, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><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>
<br>
ak@kanavin-desktop:~/developme<wbr>nt/poky/build$ devtool modify libksba<br>
Parsing recipes..done.<br>
NOTE: Fetching libksba...<br>
NOTE: Unpacking...<br>
NOTE: Patching...<br>
ERROR: Applying '<a href="http://ksba-add-pkgconfig-support.pa">ksba-add-pkgconfig-support.pa</a><wbr>tch' failed:<br>
checking file Makefile.am<br>
Hunk #1 FAILED at 21.<br>
1 out of 1 hunk FAILED<br>
checking file <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
Hunk #1 succeeded at 414 (offset 14 lines).<br>
checking file <a href="http://ksba.pc.in" rel="noreferrer" target="_blank">ksba.pc.in</a><br>
checking file src/ksba.m4<br>
ERROR: Function failed: patch_do_patch<br>
ak@kanavin-desktop:~/developme<wbr>nt/poky/build$<br>
<br>
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>
<br>
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></div>That would be useful, indeed.</div><div class="gmail_extra"><br>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>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Christopher Larson<br>clarson at kergoth dot com<br>Founder - BitBake, OpenEmbedded, OpenZaurus<br>Maintainer - Tslib<br>Senior Software Engineer, Mentor Graphics</div>
</div></div>