/usr/share/doc/monotone/html/Branches.html

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!-- Created by GNU Texinfo 6.1, http://www.gnu.org/software/texinfo/ -->
<head>
<title>monotone documentation: Branches</title>

<meta name="description" content="monotone documentation: Branches">
<meta name="keywords" content="monotone documentation: Branches">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="makeinfo">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="index.html#Top" rel="start" title="Top">
<link href="General-Index.html#General-Index" rel="index" title="General Index">
<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
<link href="Concepts.html#Concepts" rel="up" title="Concepts">
<link href="Tutorial.html#Tutorial" rel="next" title="Tutorial">
<link href="Forks-and-merges.html#Forks-and-merges" rel="prev" title="Forks and merges">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
blockquote.indentedblock {margin-right: 0em}
blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
blockquote.smallquotation {font-size: smaller}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
div.smalldisplay {margin-left: 3.2em}
div.smallexample {margin-left: 3.2em}
div.smalllisp {margin-left: 3.2em}
kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: inherit; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: inherit; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.nolinebreak {white-space: nowrap}
span.roman {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
<link rel="stylesheet" type="text/css" href="texinfo.css">


</head>

<body lang="en">
<a name="Branches"></a>
<div class="header">
<p>
Previous: <a href="Forks-and-merges.html#Forks-and-merges" accesskey="p" rel="prev">Forks and merges</a>, Up: <a href="Concepts.html#Concepts" accesskey="u" rel="up">Concepts</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="General-Index.html#General-Index" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<a name="Branches-1"></a>
<h3 class="section">1.7 Branches</h3>

<p>Sometimes, people intentionally produce forks which are <em>not
supposed to be merged</em>; perhaps they have agreed to work independently
for a time, or wish to change their files in ways which are not
logically compatible with each other. When someone produces a fork
which is supposed to last for a while (or perhaps permanently) we say
that the fork has produced a new <em>branch</em>. Branches tell monotone
which revisions you would like to merge, and which you would like to
keep separate.
</p>
<p>You can see all the available branches using <code>mtn list branches</code>.
</p>
<a name="Heads-and-merging"></a>
<h4 class="subsection">1.7.1 Heads and merging</h4>

<p>Branches are indicated with certs.  The cert name <code>branch</code> is
reserved for use by monotone, for the purpose of identifying the
revisions which are members of a branch. A <code>branch</code> cert has a
symbolic &ldquo;branch name&rdquo; as its value. When we refer to &ldquo;a branch&rdquo;,
we mean all revisions with a common branch name in their <code>branch</code>
certs.
</p>
<p>For example, suppose you are working on a program called &ldquo;wobbler&rdquo;.
You might develop many revisions of wobbler and then decide to split
your revisions into a &ldquo;stable branch&rdquo; and an &ldquo;unstable branch&rdquo;, to
help organize your work. In this case, you might call the new branches
&ldquo;wobbler-stable&rdquo; and &ldquo;wobbler-unstable&rdquo;. From then on, all
revisions in the stable branch would get a cert with name <code>branch</code>
and value <code>wobbler-stable</code>; all revisions in the unstable branch
would get a cert with name <code>branch</code> and value
<code>wobbler-unstable</code>. When a <code>wobbler-stable</code> revision forks,
the children of the fork will be merged. When a
<code>wobbler-unstable</code> revision forks, the children of the fork will
be merged. However, the <code>wobbler-stable</code> and
<code>wobbler-unstable</code> branches will not be merged together, despite
having a common ancestor.
</p>
<img src="figures/two-branches.png" alt="figures/two-branches">

<p>For each branch, the set of revisions with <em>no children</em> is
called the <em>heads</em> of the branch. Monotone can automatically
locate, and attempt to merge, the heads of a branch. If it fails to
automatically merge the heads, it may ask you for assistance or else
fail cleanly, leaving the branch alone.
</p>
<p>For example, if a fork&rsquo;s left child has a child of its own (a &ldquo;left
grandchild&rdquo;), monotone will merge the fork&rsquo;s right child with the
left grandchild, since those revisions are the heads of the branch. It
will not merge the left child with the right child, because the left
child is not a member of the heads.
</p>
<img src="figures/branch-heads.png" alt="figures/branch-heads">

<p>When there is only one revision in the heads of a branch, we say that
<i>the heads are merged</i>, or more generally that <i>the branch is
merged</i>, since the heads is the logical set of candidates for any
merging activity. If there are two or more revisions in the heads of a
branch, and you ask to merge the branch, monotone will merge them
two-at-a-time until there is only one.
</p>
<a name="Branch-Names"></a>
<h4 class="subsection">1.7.2 Branch Names</h4>

<p>The branch names used in the above section are fine for an example,
but they would be bad to use in a real project.  The reason is,
monotone branch names should be <em>globally</em> unique, over all
branches in the world.  Otherwise, when your branch eventually gets
distributed, you could get name collisions with other people&rsquo;s
work.
</p>
<p>Having two separate projects with the same monotone branch names means
those projects cannot be stored in the same database. In general,
monotone supports storing unrelated branches in a single database,
which simplifies servers. But that requires unique branch names, so
ensuring globally unique branch names allows using globally accessible
monotone servers.
</p>
<p>monotone does <em>not</em> support renaming branches (because that would
be modifying history), so choosing a good branch name up front is
important. It is possible to work around this by propagating from your
branch to one with a better name, but that is a painful process if
there are many people using the original branch name.
</p>
<p>Even if you are <em>absolutely</em> sure that your branch will never be
distributed, things could change in the future!
</p>
<p>Fortunately, we have a handy source of globally unique names &mdash; the
DNS system. When naming a branch, always prepend the reversed, fully
qualified, domain name of a host that you control or are otherwise
authorized to use.  For example, monotone development happens on the
branch <code>net.venge.monotone</code>, because <code>venge.net</code> belongs to
monotone&rsquo;s original author.  The idea is that this way, you can
coordinate with other people using a host to make sure there are no
conflicts &mdash; in the example, monotone&rsquo;s original author can be
certain that no-one else using <code>venge.net</code> will start up a
different program named <code>monotone</code>.  If you work for Yoyodyne,
Inc. (owners of yoyodyne.com), then all your branch names should look
like <code>com.yoyodyne.<em>something</em></code>.
</p>
<p>What the <code><em>something</em></code> part looks like is up to you, but
usually the first part is the project name (the <code>monotone</code> in
<code>net.venge.monotone</code>), and then possibly more stuff after that to
describe a particular branch.  For example, monotone&rsquo;s win32 support
was initially developed on the branch <code>net.venge.monotone.win32</code>
(for more information, see <a href="Naming-Conventions.html#Naming-Conventions">Naming Conventions</a>).
</p>
<p>It has to be noted that earlier versions of monotone enforced no restrictions
on branch names.  Newer versions, starting with 0.99, exclude a set of control
characters though, which mostly denote either meta characters in monotone&rsquo;s
URI syntax or are used in globs to resolve branch patterns.  These characters are
<code>?</code>, <code>,</code>, <code>*</code>, <code>%</code>, <code>+</code>, <code>{</code>, <code>}</code>, <code>[</code>,
<code>]</code>, <code>!</code> and <code>^</code>.  Additionally, <code>-</code> is deprecated as first
character of a branch name, since it is used to denote branch exclude patterns
in the aforementioned URI syntax.
</p>
<p>monotone warns on the creation of branch names which violate one of the above
restrictions and gives further directions.  Future versions of monotone are
likely to enforce these restrictions by disallowing such branch names completely.
</p>

<hr>
<div class="header">
<p>
Previous: <a href="Forks-and-merges.html#Forks-and-merges" accesskey="p" rel="prev">Forks and merges</a>, Up: <a href="Concepts.html#Concepts" accesskey="u" rel="up">Concepts</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="General-Index.html#General-Index" title="Index" rel="index">Index</a>]</p>
</div>



</body>
</html>
monotone-doc 1.1-9 / usr / share / doc / monotone / html / Branches.html
