<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 3, 2016 at 9:35 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"><span class="">On 11/03/2016 06:29 PM, Christopher Larson wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
git already provides such a UI, afaik devtool just needs to use git-am<br>
to apply the patches, ideally passing -3 to it, and let the user use git<br>
am to resolve and continue applying patches.<br>
</blockquote>
<br></span>
I don't think git am has any UI that helps with rebasing the rejects, and -3 is often not useful here, as we don't have the commit history, if the source is coming from tarball.<br></blockquote><div><br></div><div>Fairly sure that’s not actually correct. See below.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
What you need to do here is to use git am --reject, which would partially apply the patch, then find all the *.rej files and let the user manually edit them in, then complete the patch application with git am --continue.</blockquote><div><br></div><div>With -3, it’ll merge it into the file with conflict markers, which is a lot more pleasant to deal with than .rej files, even without the merge-base being available.</div></div>-- <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>