master-next

master-next

[Slater, Joseph]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Is there something "different" about this branch?  I find that if I have a local master and master-next, and am on master, when I do a pull master-next will wind up both ahead and behind origin/master-next.  If I switch to master-next and rebase, it might fail, or it might leave me with one or more "local" commits that are not mine.   For the case I tried today, it is commit 3d4f241 which seems to only be on my local master-next, but came from Mark Horn/Ross Burton on August 2.

Can anyone explain this?

Joe


[-- Attachment #2: Type: text/html, Size: 2337 bytes --]

Re: master-next

[Leonardo Sandoval]

On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote:
> Is there something “different” about this branch? 

this branch is the what at some point will be landed to master, pretty
dynamic and only created/used by key maintainers (RP, Ross) and consumed
by the auto-builder.

>  I find that if I have a local master and master-next, and am on
> master, when I do a pull master-next will wind up both ahead and
> behind origin/master-next.  

use 'git fetch' instead. This will just update your branches but wont
try any merge/rebase.


> If I switch to master-next and rebase, it might fail, or it might
> leave me with one or more “local” commits that are not mine.   For the
> case I tried today, it is commit 3d4f241 which seems to only be on my
> local master-next, but came from Mark Horn/Ross Burton on August 2.
> 


>  
> 
> Can anyone explain this?
> 
>  
> 
> Joe
> 
>  
> 
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: master-next

[Richard Purdie]

On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote:
> Is there something “different” about this branch?  I find that if I
> have a local master and master-next, and am on master, when I do a
> pull master-next will wind up both ahead and behind origin/master-
> next.  If I switch to master-next and rebase, it might fail, or it
> might leave me with one or more “local” commits that are not mine.  
> For the case I tried today, it is commit 3d4f241 which seems to only
> be on my local master-next, but came from Mark Horn/Ross Burton on
> August 2.
>  
> Can anyone explain this?

master-next rebases. The patch in question was in master-next, it
failed tests and I booted it out until it gets fixed.

master never rebases by comparison.

Cheers,

Richard

Re: master-next

[Khem Raj]

On Mon, Aug 14, 2017 at 2:44 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote:
>> Is there something “different” about this branch?  I find that if I
>> have a local master and master-next, and am on master, when I do a
>> pull master-next will wind up both ahead and behind origin/master-
>> next.  If I switch to master-next and rebase, it might fail, or it
>> might leave me with one or more “local” commits that are not mine.
>> For the case I tried today, it is commit 3d4f241 which seems to only
>> be on my local master-next, but came from Mark Horn/Ross Burton on
>> August 2.
>>
>> Can anyone explain this?
>
> master-next rebases. The patch in question was in master-next, it
> failed tests and I booted it out until it gets fixed.
>
> master never rebases by comparison.

may be using branch namespace might make it better ?
something like $user/branch means its a private branch
and branches in global namespaces are public branches

>
> Cheers,
>
> Richard
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core