How does openembedded-core-contrib/master relate to openembedded-core/master?

How does openembedded-core-contrib/master relate to openembedded-core/master?

[Leon Woestenberg]

Hello,

how does the master branch of openembedded-core-contrib relate to the
master branch of openembedded-core?

Is -core-contrib tracking -core 1-to-1?

The reason I ask is that user contribution go into feature branches
(name/feature) of -core-contrib, but should ideally be based against
core itself, as RP pulls there, and we want clean pulls.

http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/
http://git.openembedded.org/cgit.cgi/openembedded-core/log/

My first feature branch (likewise/gnuspe) was cloned from, branched,
and pushes against openembedded-core-contrib, is that the correct
approach?

Regards,
-- 
Leon

Re: How does openembedded-core-contrib/master relate to openembedded-core/master?

[Richard Purdie]

On Wed, 2011-05-11 at 14:37 +0200, Leon Woestenberg wrote:
> how does the master branch of openembedded-core-contrib relate to the
> master branch of openembedded-core?
> 
> Is -core-contrib tracking -core 1-to-1?

I probably shouldn't have pushed that at all to be honest, its just
likely to get out of date quickly :/. I was fiddling with some
configuration, trying to allow easiest comparisons of trees in the
contrib repo and the creation of it was an artefact of that, sorry.

Certainly there would always need to be a 1:1 mapping. The current
server config won't actually allow me to delete the master branch either
as its the "current" branch of the repo and would be used in git clones.

> The reason I ask is that user contribution go into feature branches
> (name/feature) of -core-contrib, but should ideally be based against
> core itself, as RP pulls there, and we want clean pulls.
> 
> http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/
> http://git.openembedded.org/cgit.cgi/openembedded-core/log/
> 
> My first feature branch (likewise/gnuspe) was cloned from, branched,
> and pushes against openembedded-core-contrib, is that the correct
> approach?

The pull request you sent looked fine. This only works if that master
branch is kept in sync with the main repo though.

Cheers,

Richard

Re: How does openembedded-core-contrib/master relate to openembedded-core/master?

[Leon Woestenberg]

Hello Richard,

On Wed, May 11, 2011 at 3:41 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-05-11 at 14:37 +0200, Leon Woestenberg wrote:
>> how does the master branch of openembedded-core-contrib relate to the
>> master branch of openembedded-core?
>>
>> Is -core-contrib tracking -core 1-to-1?
>
>> My first feature branch (likewise/gnuspe) was cloned from, branched,
>> and pushes against openembedded-core-contrib, is that the correct
>> approach?
>
> The pull request you sent looked fine. This only works if that master
> branch is kept in sync with the main repo though.
>
which was exactly why I wrote this email. Thanks for confirming my concerns.


So the safer way would be to create a feature branch on core-contrib,
that however is (re)based on core.

Should I clone core, then create a feature branch that I push to core-contrib?
Should I clone core-contrib, then rebase against core, then create a
feature branch that I push to core-contrib?

In either way, I could use a list of the corresponding git commands,
as I hate to screw up and we need to document this anyway; we need
more core developers.

Regards,
-- 
Leon

Re: How does openembedded-core-contrib/master relate to openembedded-core/master?

[Joshua Lock]

On Wed, 2011-05-11 at 19:22 +0200, Leon Woestenberg wrote:
> Hello Richard,
> 
> On Wed, May 11, 2011 at 3:41 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Wed, 2011-05-11 at 14:37 +0200, Leon Woestenberg wrote:
> >> how does the master branch of openembedded-core-contrib relate to the
> >> master branch of openembedded-core?
> >>
> >> Is -core-contrib tracking -core 1-to-1?
> >
> >> My first feature branch (likewise/gnuspe) was cloned from, branched,
> >> and pushes against openembedded-core-contrib, is that the correct
> >> approach?
> >
> > The pull request you sent looked fine. This only works if that master
> > branch is kept in sync with the main repo though.
> >
> which was exactly why I wrote this email. Thanks for confirming my concerns.
> 
> 
> So the safer way would be to create a feature branch on core-contrib,
> that however is (re)based on core.
> 
> Should I clone core, then create a feature branch that I push to core-contrib?
> Should I clone core-contrib, then rebase against core, then create a
> feature branch that I push to core-contrib?

Yeah, the way to do this is with git remotes. A basic work-flow is as
follows:

$ git clone ssh://git@git.openembedded.net/openembedded-core
cd openembedded-core
$ git remote add contrib
ssh://git@git.openembedded.net/openembedded-core-contrib
$ git branch my-name/my-work
$ git checkout my-name/my-work
<some work and commits on my-name/my-work>
$ git push contrib my-name/my-work
$ ./scripts/create-pull-request -b my-name/my-work

https://wiki.yoctoproject.org/wiki/Poky_Contributions#Git_workflow

HTH,
Joshua
-- 
Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre