summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-09 14:31:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 16:20:56 +0100
commitf1c2fea3f82c4b63a22d280f508dd32559d0cebe (patch)
treeeb4e3520039b18624b2d085ca96945136db90edf
parent47fda36cec06347dede95f0fb98eb9e2a3576922 (diff)
downloadpoky-f1c2fea3f82c4b63a22d280f508dd32559d0cebe.tar.gz
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>
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml28
1 files changed, 15 insertions, 13 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index d57260f10b..b42fafd770 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -838,7 +838,7 @@
838 <title>Repositories, Tags, and Branches</title> 838 <title>Repositories, Tags, and Branches</title>
839 839
840 <para> 840 <para>
841 As mentioned earlier in section 841 As mentioned earlier in the section
842 "<link linkend='yocto-project-repositories'>Yocto Project Source Repositories</link>", 842 "<link linkend='yocto-project-repositories'>Yocto Project Source Repositories</link>",
843 the Yocto Project maintains source repositories at 843 the Yocto Project maintains source repositories at
844 <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>. 844 <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.
@@ -851,8 +851,8 @@
851 within a project (e.g. a new feature or updated documentation). 851 within a project (e.g. a new feature or updated documentation).
852 Creating a tree-like structure based on project divergence allows for excellent historical 852 Creating a tree-like structure based on project divergence allows for excellent historical
853 information over the life of a project. 853 information over the life of a project.
854 This methodology also allows for an environment in which you can do lots of 854 This methodology also allows for an environment from which you can do lots of
855 local experimentation on a project as you develop changes or new features. 855 local experimentation on projects as you develop changes or new features.
856 </para> 856 </para>
857 857
858 <para> 858 <para>
@@ -869,8 +869,8 @@
869 When you clone a Git repository, you end up with an identical copy of the 869 When you clone a Git repository, you end up with an identical copy of the
870 repository on your development system. 870 repository on your development system.
871 Once you have a local copy of a repository, you can take steps to develop locally. 871 Once you have a local copy of a repository, you can take steps to develop locally.
872 For examples on how to clone Git repositories, see the section 872 For examples on how to clone Git repositories, see the
873 "<link linkend='getting-setup'>Getting Set Up</link>" earlier in this manual. 873 "<link linkend='getting-setup'>Getting Set Up</link>" section.
874 </para> 874 </para>
875 875
876 <para> 876 <para>
@@ -911,13 +911,15 @@
911 $ cd poky 911 $ cd poky
912 $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; 912 $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
913 </literallayout> 913 </literallayout>
914 In this example, the name of the top-level directory of your local Yocto Project 914 In this example, the name of the top-level directory of your local
915 Files Git repository is <filename>poky</filename>, 915 <link linkend='source-directory'>Source Directory</link>
916 and the name of the local working area (or local branch) you have created and checked 916 is <filename>poky</filename>,
917 out is <filename>&DISTRO_NAME;</filename>. 917 and the name of that local working area (local branch) you just
918 The files in your repository now reflect the same files that are in the 918 created and checked out is <filename>&DISTRO_NAME;</filename>.
919 <filename>&DISTRO_NAME;</filename> development branch of the Yocto Project's 919 The files in your local repository now reflect the same files that
920 <filename>poky</filename> repository. 920 are in the <filename>&DISTRO_NAME;</filename> development
921 branch of the Yocto Project's <filename>poky</filename>
922 upstream repository.
921 It is important to understand that when you create and checkout a 923 It is important to understand that when you create and checkout a
922 local working branch based on a branch name, 924 local working branch based on a branch name,
923 your local environment matches the "tip" of that development branch 925 your local environment matches the "tip" of that development branch
@@ -970,7 +972,7 @@
970 Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>). 972 Release tag (<filename>&DISTRO_NAME;-&POKYVERSION;</filename>).
971 It is important to understand that when you create and checkout a local 973 It is important to understand that when you create and checkout a local
972 working branch based on a tag, your environment matches a specific point 974 working branch based on a tag, your environment matches a specific point
973 in time and not a development branch. 975 in time and not the entire development branch.
974 </para> 976 </para>
975 </section> 977 </section>
976 978