<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
<html>
<!--This manuals documents relevant information regarding the deployment,
organization, and administration of CentOS Artwork Repository.
Copyright C 2009-2011 Alain Reguera Delgado
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
copy of the license is included in the section entitled GNU Free
Documentation License.
-->
<!-- Created on March, 8 2011 by texi2html 1.76 -->
<!--
Written by: Lionel Cons <Lionel.Cons@cern.ch> (original author)
Karl Berry <karl@freefriends.org>
Olaf Bachmann <obachman@mathematik.uni-kl.de>
and many others.
Maintained by: Many creative people <dev@texi2html.cvshome.org>
Send bugs and suggestions to <users@texi2html.cvshome.org>
-->
<head>
<title>CentOS Artwork Repository: 2.1 The branches Directory</title>
<meta name="description" content="CentOS Artwork Repository: 2.1 The branches Directory">
<meta name="keywords" content="CentOS Artwork Repository: 2.1 The branches Directory">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2html 1.76">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
<!--
@import "/home/centos/artwork/trunk/Identity/Models/Css/Texi2html/common.css";
a.summary-letter {text-decoration: none}
pre.display {font-family: serif}
pre.format {font-family: serif}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: serif; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: serif; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.sansserif {font-family:sans-serif; font-weight:normal;}
ul.toc {list-style: none}
-->
</style>
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="repository_4.html#SEC4" title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#SEC6" title="Next section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="repository_4.html#SEC4" title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="repository_4.html#SEC4" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="repository_79.html#SEC416" title="Next chapter"> >> </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="repository.html#SEC_Top" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="repository_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="repository_79.html#SEC416" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="repository_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<a name="Filesystem-branches"></a>
<a name="SEC5"></a>
<h2 class="section"> 2.1 The <tt>`branches'</tt> Directory </h2>
<a name="SEC6"></a>
<h3 class="subsection"> 2.1.1 Goals </h3>
<p>This directory implements the Subversion's branches concept in a
trunk, branches, tags repository structure.
</p>
<a name="SEC7"></a>
<h3 class="subsection"> 2.1.2 Description </h3>
<p>The <tt>`branches/'</tt> directory structure is an intermediate space
between <tt>`trunk/'</tt> directory structure and <tt>`tags/'</tt> directory
structure.
</p>
<a name="SEC8"></a>
<h3 class="subsection"> 2.1.3 Usage </h3>
<p>If changes committed to the main develpment line are all predictable
(e.g., there is just one person committing changes), there is no a big
need of using <tt>`branches/'</tt> directory structure, in this case we
can go straight from <tt>`trunk/'</tt> to <tt>`tags/'</tt>. However, when
there is no way to predict changes in the main development directory
structure (e.g., there are many people working at it at the same time)
it is required to find out a space when changes can occur in
predictable ways.
</p>
<p>At this point several options may arise to work with branches. Let's
see a few ones:
</p>
<a name="SEC9"></a>
<h4 class="subsubsection"> 2.1.3.1 Temporal Branch </h4>
<p>The branched directory is created temporaly to fix a problem and when
it is done, it is merged back into <tt>`trunk/'</tt> directory structure
and removed from the repository.
</p>
<a name="SEC10"></a>
<h4 class="subsubsection"> 2.1.3.2 Major Release Branch </h4>
<p>The branched directory is created to implement the concept of major
release. In this configuration we frequently take a functional
instance of <tt>`trunk/'</tt> directory structure and create branch for
it. While <tt>`trunk/'</tt> directory structure can receive new
functionalities or remove old ones, the branched instance of it does
not. The branched instance can receive updates for available files
only but not introduce new ones or remove old ones as it is done in
<tt>`trunk/'</tt> directory structure.
</p>
<p>The frequency each branched directory is created depends on how long
can the branched directory could be on its state before consider it as
dated and also the time we want to provide it as stable for everyone
to use as expected. The exact time depends on the sort of information
such branched directory structure contains.
</p>
<p>To illustrate this concept consider the <tt>`trunk/Scripts/Bash/Cli'</tt>
directory structure. This directory contains the main development line
of <code>centos-art</code> command-line internface. If there are several
people working on it and you find a problem in it, it could be very
frustrating for you try to solve it in an environment when other
changes could be introduced unexpectedly, specially if such change you
need to do is considerable long. For that reasing it is much better to
commit small changes frequently to fix small things, but if you
absolutly need to make a long change (e.g., you want to implement a
new functionality) it is necessary you create branch of <tt>`trunk/'</tt>
directory structure (or any other branch or tag already created) to be
on the safe side while you implement your functionality.
</p>
<p>In order to keep branch creation organized, we use the <tt>`trunk'</tt>
directory structure as reference and add a numerical identifier to the
end of the path that increments one unit for each branch created.
</p>
<a name="SEC11"></a>
<h3 class="subsection"> 2.1.4 See also </h3>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="repository_7.html#SEC17">2.3 The <tt>`trunk'</tt> Directory</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a href="repository_6.html#SEC12">2.2 The <tt>`tags'</tt> Directory</a></td><td> </td><td align="left" valign="top">
</td></tr>
</table>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#SEC10" title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="repository_6.html#SEC12" title="Next section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="repository_4.html#SEC4" title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#SEC5" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="repository_79.html#SEC416" title="Next chapter"> >> </a>]</td>
</tr></table>
<p>
<font size="-1">
This document was generated on <i>March, 8 2011</i> using <a class="www" href="http://texi2html.cvshome.org/"><i>texi2html 1.76</i></a>.
</font>
<br>
</p>
</body>
</html>