/usr/share/doc/monotone/html/Forks-and-merges.html is in monotone-doc 1.1-9.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | <!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: Forks and merges</title>
<meta name="description" content="monotone documentation: Forks and merges">
<meta name="keywords" content="monotone documentation: Forks and merges">
<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="Branches.html#Branches" rel="next" title="Branches">
<link href="Storage-and-workflow.html#Storage-and-workflow" rel="prev" title="Storage and workflow">
<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="Forks-and-merges"></a>
<div class="header">
<p>
Next: <a href="Branches.html#Branches" accesskey="n" rel="next">Branches</a>, Previous: <a href="Storage-and-workflow.html#Storage-and-workflow" accesskey="p" rel="prev">Storage and workflow</a>, Up: <a href="Concepts.html#Concepts" accesskey="u" rel="up">Concepts</a> [<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="Forks-and-merges-1"></a>
<h3 class="section">1.6 Forks and merges</h3>
<p>So far we have been talking about revisions as though each logically
follows exactly one revision before it, in a simple sequence of
revisions.
</p>
<img src="figures/linear-history.png" alt="figures/linear-history">
<p>This is a rosy picture, but sometimes it does not work out this
way. Sometimes when you make new revisions, other people are
<i>simultaneously</i> making new revisions as well, and their revisions
might be derived from the same parent as yours, or contain different
changesets. Without loss of generality, we will assume simultaneous
edits only happen two-at-a-time; in fact many more edits may happen at
once but our reasoning will be the same.
</p>
<p>We call this situation of simultaneous edits a <em>fork</em>, and will
refer to the two children of a fork as the <i>left child</i> and <i>right
child</i>. In a large collection of revisions with many people editing
files, especially on many different computers spread all around the
world, forks are a common occurrence.
</p>
<img src="figures/fork.png" alt="figures/fork">
<p>If we analyze the changes in each child revision, we will often find
that the changeset between the parent and the left child are unrelated
to the changeset between the parent and the right child. When this
happens, we can usually <em>merge</em> the fork, producing a common
grandchild revision which contains both changesets.
</p>
<img src="figures/merge.png" alt="figures/merge">
</body>
</html>
|