I've recently noticed that, on Morty, feature branches of a Yocto kernel are not
merged anymore. This is due to the fact that the meta-series file does not
process the git merge commands anymore.
This commit creates a new merge command to be executed when processing the
kernel metadata. To solve t
On Wed, Jan 25, 2017 at 5:37 AM, David Vincent
wrote:
> I've recently noticed that, on Morty, feature branches of a Yocto kernel
> are not
> merged anymore. This is due to the fact that the meta-series file does not
> process the git merge commands anymore.
>
Indeed. I dropped that functionality
On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield
wrote:
>
>
> On Wed, Jan 25, 2017 at 5:37 AM, David Vincent
> wrote:
>
>> I've recently noticed that, on Morty, feature branches of a Yocto kernel
>> are not
>> merged anymore. This is due to the fact that the meta-series file does not
>> process t
On dimanche 29 janvier 2017 23:31:49 CET Bruce Ashfield wrote:
> On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield
> wrote:
>
> I spent Friday looking into this in more detail, and to keep things
> consistent
> with how the path and config queues are handled, with all the tree
> manipulations
> pul
On 2017-02-03 03:42 AM, David Vincent wrote:
On dimanche 29 janvier 2017 23:31:49 CET Bruce Ashfield wrote:
On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield
wrote:
I spent Friday looking into this in more detail, and to keep things
consistent
with how the path and config queues are handled, wit
On 2017-02-03 03:42 AM, David Vincent wrote:
On dimanche 29 janvier 2017 23:31:49 CET Bruce Ashfield wrote:
On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield
wrote:
I spent Friday looking into this in more detail, and to keep things
consistent
with how the path and config queues are handled, wit
On vendredi 3 février 2017 13:51:34 CET Bruce Ashfield wrote:
>
> I was able to merge branches with this patch applied to Morty.
>
> Cheers,
>
> Bruce
>
I've just successfully tested it on Morty myself. Works for me too, branches
are merged just like they were before !
Thank you
David
--
_
On 2017-02-07 06:21 AM, David Vincent wrote:
On vendredi 3 février 2017 13:51:34 CET Bruce Ashfield wrote:
I was able to merge branches with this patch applied to Morty.
Cheers,
Bruce
I've just successfully tested it on Morty myself. Works for me too, branches
are merged just like they were
