Re: [OE-core] using devtool for rebasing patches

2016-11-04 Thread Alexander Kanavin
On 11/03/2016 09:29 PM, Paul Eggleton wrote: "devtool upgrade" is designed specifically to handle the upgrade case and tries to rebase the old patches onto the new version, putting you into resolution mode with "git am" if it fails to apply a patch. I appreciate that you may now be working

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Khem Raj
> On Nov 3, 2016, at 9:29 AM, Christopher Larson wrote: > > > On Thu, Nov 3, 2016 at 9:01 AM, Alexander Kanavin > > wrote: > it would be very useful if devtool offered support for rebasing

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Paul Eggleton
On Fri, 04 Nov 2016 08:29:26 Paul Eggleton wrote: > Hi Alex, > > On Thu, 03 Nov 2016 18:01:27 Alexander Kanavin wrote: > > 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: > >

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Paul Eggleton
Hi Alex, On Thu, 03 Nov 2016 18:01:27 Alexander Kanavin wrote: > 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: > > ak@kanavin-desktop:~/development/poky/build$ devtool modify

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Paul Eggleton
On Thu, 03 Nov 2016 20:14:04 Patrick Ohly wrote: > On Thu, 2016-11-03 at 10:14 -0700, Christopher Larson wrote: > > On Thu, Nov 3, 2016 at 9:35 AM, Alexander Kanavin > > > > wrote: > > What you need to do here is to use git am --reject, which > >

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Patrick Ohly
On Thu, 2016-11-03 at 10:14 -0700, Christopher Larson wrote: > > On Thu, Nov 3, 2016 at 9:35 AM, Alexander Kanavin > wrote: > > What you need to do here is to use git am --reject, which > would partially apply the patch, then find all the *.rej

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Christopher Larson
On Thu, Nov 3, 2016 at 9:35 AM, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > On 11/03/2016 06:29 PM, Christopher Larson wrote: > >> 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

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Patrick Ohly
On Thu, 2016-11-03 at 18:01 +0200, Alexander Kanavin wrote: > Hello Paul, > > it would be very useful if devtool offered support for rebasing source > patches when they fail to apply +1 for that. I tried it the other way around: first "devtool modify", then rebasing using git (which only works

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Alexander Kanavin
On 11/03/2016 06:29 PM, Christopher Larson wrote: 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. I don't think git am has any UI that helps with

Re: [OE-core] using devtool for rebasing patches

2016-11-03 Thread Christopher Larson
On Thu, Nov 3, 2016 at 9:01 AM, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > 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: > >

[OE-core] using devtool for rebasing patches

2016-11-03 Thread Alexander Kanavin
Hello Paul, 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: ak@kanavin-desktop:~/development/poky/build$ devtool modify libksba Parsing recipes..done. NOTE: Fetching libksba...