Question about GIT branches workflow
site-openmoko.org at onerussian.com
Sun Aug 10 21:21:39 CEST 2008
Hi to all OE developers,
Since I finally managed to build that glibc I decided to look at the
flow of the changes between different branches in the git and I got a
ASU branches seems to be quite clean - they split originally in May
2008, asu.stable/.testing is quite close to the asu.dev, and
i.e. git diff origin/org.openmoko.asu.dev origin/org.openmoko.asu.stable
between them makes sense. And it seems to be clear that .testing
was acquiring commits by cherry picking from asu.dev
on the other hand I am not sure what is typical workflow between main
.dev branch .asu branches.
I see lots of cherry picked from .asu patches
within main .dev, but also main .dev contains lots of changes which
seems to clone changes in asu.dev up to some spaces
git diff origin/org.openmoko.dev origin/org.openmoko.asu.stable
even MAINTAINER file is diverged considerably between the two
and you can find changes like
- # Sanity check that the libname.lai is unique
- number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l`
- if [ $number_of_files -gt 1 ]; then
- oefatal "oe_libinstall: $dotlai is not unique in $dir"
+ # Sanity check that the libname.lai is unique
+ number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l`
+ if [ $number_of_files -gt 1 ]; then
+ oefatal "oe_libinstall: $dotlai is not unique in $dir"
which are to signal that some patches weren't cherry picked?
and there are some bake recepies updated in .asu but not in main .dev.
So I just wondered what usually happens between those 3 main branches (lets
hold org.openembedded.dev aside since it seems that it just hooked into this
git via bakerecepies which clone needed repositories), is there any kind of "policy"?
Thanks in advance for clearing things up
=------------------------------ /v\ ----------------------------=
Keep in touch // \\ (yoh@|www.)onerussian.com
Yaroslav Halchenko /( )\ ICQ#: 60653192
Linux User ^^-^^ 
More information about the devel