dev-manual: Edits to "Repositories, Tags, and Branches" section.

(From yocto-docs rev: 6ab8d6441d53871b2e0a7163a31b1505a86872b2)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2013-04-09 14:31:08 -07:00 committed by Richard Purdie
parent 47fda36cec
commit f1c2fea3f8
1 changed files with 15 additions and 13 deletions

View File

@ -838,7 +838,7 @@
<title>Repositories, Tags, and Branches</title> <title>Repositories, Tags, and Branches</title>
<para> <para>
As mentioned earlier in section As mentioned earlier in the section
"<link linkend='yocto-project-repositories'>Yocto Project Source Repositories</link>", "<link linkend='yocto-project-repositories'>Yocto Project Source Repositories</link>",
the Yocto Project maintains source repositories at the Yocto Project maintains source repositories at
<ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>. <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.
@ -851,8 +851,8 @@
within a project (e.g. a new feature or updated documentation). within a project (e.g. a new feature or updated documentation).
Creating a tree-like structure based on project divergence allows for excellent historical Creating a tree-like structure based on project divergence allows for excellent historical
information over the life of a project. information over the life of a project.
This methodology also allows for an environment in which you can do lots of This methodology also allows for an environment from which you can do lots of
local experimentation on a project as you develop changes or new features. local experimentation on projects as you develop changes or new features.
</para> </para>
<para> <para>
@ -869,8 +869,8 @@
When you clone a Git repository, you end up with an identical copy of the When you clone a Git repository, you end up with an identical copy of the
repository on your development system. repository on your development system.
Once you have a local copy of a repository, you can take steps to develop locally. Once you have a local copy of a repository, you can take steps to develop locally.
For examples on how to clone Git repositories, see the section For examples on how to clone Git repositories, see the
"<link linkend='getting-setup'>Getting Set Up</link>" earlier in this manual. "<link linkend='getting-setup'>Getting Set Up</link>" section.
</para> </para>
<para> <para>
@ -911,13 +911,15 @@
$ cd poky $ cd poky
$ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
</literallayout> </literallayout>
In this example, the name of the top-level directory of your local Yocto Project In this example, the name of the top-level directory of your local
Files Git repository is <filename>poky</filename>, <link linkend='source-directory'>Source Directory</link>
and the name of the local working area (or local branch) you have created and checked is <filename>poky</filename>,
out is <filename>&DISTRO_NAME;</filename>. and the name of that local working area (local branch) you just
The files in your repository now reflect the same files that are in the created and checked out is <filename>&DISTRO_NAME;</filename>.
<filename>&DISTRO_NAME;</filename> development branch of the Yocto Project's The files in your local repository now reflect the same files that
<filename>poky</filename> repository. are in the <filename>&DISTRO_NAME;</filename> development
branch of the Yocto Project's <filename>poky</filename>
upstream repository.
It is important to understand that when you create and checkout a It is important to understand that when you create and checkout a
local working branch based on a branch name, local working branch based on a branch name,
your local environment matches the "tip" of that development branch your local environment matches the "tip" of that development branch
@ -970,7 +972,7 @@
Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>). Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>).
It is important to understand that when you create and checkout a local It is important to understand that when you create and checkout a local
working branch based on a tag, your environment matches a specific point working branch based on a tag, your environment matches a specific point
in time and not a development branch. in time and not the entire development branch.
</para> </para>
</section> </section>