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