From 715ad8daf9c2ffe652bdce3b90517ad1074dd2cd Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Mon, 23 Nov 2020 18:02:13 +0000 Subject: dev-manual-common-tasks: Fix refs to testing branches After discussions on IRC with Ross we concluded that the `ross/mut` branch shouldn't really be listed in the docs as it's more of a personal test branch. Instead we should list the -next branches for openembedded-core and poky. (From yocto-docs rev: a6bb1f7b677ea0b540735497fbbbda64ce3653ce) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- .../dev-manual/dev-manual-common-tasks.rst | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'documentation/dev-manual') diff --git a/documentation/dev-manual/dev-manual-common-tasks.rst b/documentation/dev-manual/dev-manual-common-tasks.rst index 201e187c30..e2957f479a 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.rst +++ b/documentation/dev-manual/dev-manual-common-tasks.rst @@ -10666,18 +10666,27 @@ to a contribution repository that is upstream. See the ":ref:`gs-git-workflows-a section in the Yocto Project Overview and Concepts Manual for additional concepts on working in the Yocto Project development environment. -Two commonly used testing repositories exist for OpenEmbedded-Core: - -- *"ross/mut" branch:* The "mut" (master-under-test) tree exists in the - ``poky-contrib`` repository in the - :yocto_git:`Yocto Project source repositories <>`. - -- *"master-next" branch:* This branch is part of the main "poky" - repository in the Yocto Project source repositories. - -Maintainers use these branches to test submissions prior to merging -patches. Thus, you can get an idea of the status of a patch based on -whether the patch has been merged into one of these branches. +Maintainers commonly use ``-next`` branches to test submissions prior to +merging patches. Thus, you can get an idea of the status of a patch based on +whether the patch has been merged into one of these branches. The commonly +used testing branches for OpenEmbedded-Core are as follows: + +- *openembedded-core "master-next" branch:* This branch is part of the + :oe_git:`openembedded-core ` repository and contains + proposed changes to the core metadata. + +- *poky "master-next" branch:* This branch is part of the + :yocto_git:`poky ` repository and combines proposed + changes to bitbake, the core metadata and the poky distro. + +Similarly, stable branches maintained by the project may have corresponding +``-next`` branches which collect proposed changes. For example, +``&DISTRO_NAME_NO_CAP;-next`` and ``&DISTRO_NAME_NO_CAP_MINUS_ONE;-next`` +branches in both the "openembdedded-core" and "poky" repositories. + +Other layers may have similar testing branches but there is no formal +requirement or standard for these so please check the documentation for the +layers you are contributing to. .. note:: -- cgit v1.2.3-54-g00ecf