Hello,

We are deprecating the nightly branch of both Gaia and b2g-manifest (repo 
manifests).  The nightly branch will be superseded by the v1-train branch of 
both Gaia and b2g-manifest.  We will be deleting the nightly branch in the near 
future.  There will also be a v1.0.0 branch of both repositories for the work 
tracking our 1.0.0 release.

The new default branch to pull in B2G's config.sh script is 'v1-train'.  If 
you're currently on the nightly branch and would like to be on the supported 
v1-train branch, you can pull updates to your top level B2G repository and 
rerun ./config.sh. An example to do this would be:

$ cd B2G
$ git fetch origin && git merge origin/master
$ ./config.sh <device>

This will set up your repo tree and do a repo sync with the new branches.  In 
an effort to reduce confusion, here is the mappings between the BRANCH value 
passed to config.sh and the branches of Gecko and Gaia you'll end up with:

* "BRANCH=master ./config.sh" will yield an ancient copy [1] of Gecko's 
'master' branch (mozilla-central) and Gaia's 'master' branch
* "BRANCH=v1-train ./config.sh" will yield Gecko's 'gecko-18' (mozilla-b2g18) 
branch and Gaia's 'v1-train' branch
* "BRANCH=v1.0.0 ./config.sh" will yield Gecko's 'v1.0.0' branch and Gaia's 
'v1.0.0' branch

If you have more questions about branching or about what code ends up where, 
there is a helpful wiki page that's maintained by our Release Management team 
at https://wiki.mozilla.org/Release_Management/B2G_Landing that explains B2G 
branching in more detail.  If you still have questions, please feel free to ask 
me.

Thanks,

John Ford

[1] for info, see https://bugzilla.mozilla.org/show_bug.cgi?id=820955.  If you 
want to work on mozilla-central, it's probably best to manage your own m-c tree 
and use GECKO_PATH in .userconfig
_______________________________________________
dev-b2g mailing list
[email protected]
https://lists.mozilla.org/listinfo/dev-b2g

Reply via email to