From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 1/1] base.bbclass: show layer's branches/revisions in the banner info
Date: Tue, 28 Jun 2011 10:33:18 -0500 [thread overview]
Message-ID: <4E09F43E.508@windriver.com> (raw)
In-Reply-To: <1865303E0DED764181A9D882DEF65FB6A167F0C716@shsmsx502.ccr.corp.intel.com>
On 6/28/11 10:21 AM, Cui, Dexuan wrote:
> Koen Kooi wrote:
>> Op 28 jun 2011, om 16:52 heeft Cui, Dexuan het volgende geschreven:
>>
>>> Hi, thank you very much for the suggestions!
>>> I worked out a vesion 2 patch that combines 2 and 3:
>>> http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/banner_v2&id=2c2d9d7c0e942b6748bc8bd7d5980113bae9a836
>>
>> Could you in the future please base them on oe-core instead of poky?
>> I just did 'git merge 2c2d9d7c0e942b6748bc8bd7d5980113bae9a836' and
>> git blew up.
> Sorry... but to basing them on oe-core, do I need the permission to push my commits to my own branch in git://git.openembedded.org/openembedded-core-contrib? I suppose so and I should put my public key somewhere into the server?
You can push oe-core (based) changes to the poky-contrib tree. Many of us do
this regularly.
I base my changes usually on oe-core, unless they contain poky specific code..
I push both types to the same poky-contrib repository (in different branches of
course).
(I also always avoid "merge", and always use cherry-pick when pulling code from
someone else's branches into my own..)
--Mark
> Thanks,
> -- Dexuan
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
next prev parent reply other threads:[~2011-06-28 15:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 5:37 [PATCH 0/1] base.bbclass: show layer's branches/revisions in the banner info Dexuan Cui
2011-06-28 5:37 ` [PATCH 1/1] " Dexuan Cui
2011-06-28 6:45 ` Koen Kooi
2011-06-28 11:07 ` Paul Eggleton
2011-06-29 1:01 ` Khem Raj
2011-06-29 16:14 ` Cui, Dexuan
2011-06-29 16:19 ` Koen Kooi
2011-06-29 16:44 ` Cui, Dexuan
2011-06-29 18:32 ` Khem Raj
2011-06-29 21:16 ` Koen Kooi
2011-06-28 14:27 ` Mark Hatle
2011-06-28 14:52 ` Cui, Dexuan
2011-06-28 15:10 ` Koen Kooi
2011-06-28 15:21 ` Cui, Dexuan
2011-06-28 15:24 ` Phil Blundell
2011-06-28 15:33 ` Mark Hatle [this message]
2011-06-28 15:45 ` Cui, Dexuan
2011-06-28 15:51 ` Koen Kooi
2011-06-28 15:13 ` Koen Kooi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E09F43E.508@windriver.com \
--to=mark.hatle@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.