Mercurial > hg
comparison mercurial/help/glossary.txt @ 11437:9fa255c32406 stable
help: glossary.txt formatting fixes
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Wed, 23 Jun 2010 17:50:27 -0300 |
parents | 45eadf71df22 |
children | 9d905b9769af |
comparison
equal
deleted
inserted
replaced
11436:45eadf71df22 | 11437:9fa255c32406 |
---|---|
6 ancestor. See also: 'Descendant'. | 6 ancestor. See also: 'Descendant'. |
7 | 7 |
8 Branch | 8 Branch |
9 (Noun) A child changeset that has been created from a parent that | 9 (Noun) A child changeset that has been created from a parent that |
10 is not a head. These are known as topological branches, see | 10 is not a head. These are known as topological branches, see |
11 'Branch, topological'.If a topological branch is named, it becomes | 11 'Branch, topological'. If a topological branch is named, it becomes |
12 a named branch. If a topological branch is not named, it becomes | 12 a named branch. If a topological branch is not named, it becomes |
13 an anonymous branch. See 'Branch, anonymous' and 'Branch, named'. | 13 an anonymous branch. See 'Branch, anonymous' and 'Branch, named'. |
14 | 14 |
15 Branches may be created when changes are pulled from or pushed to | 15 Branches may be created when changes are pulled from or pushed to |
16 a remote repository, since new heads may be created by these | 16 a remote repository, since new heads may be created by these |
149 The repository of changesets of a distributed version control | 149 The repository of changesets of a distributed version control |
150 system (DVCS) can be described as a directed acyclic graph (DAG), | 150 system (DVCS) can be described as a directed acyclic graph (DAG), |
151 consisting of nodes and edges, where nodes correspond to | 151 consisting of nodes and edges, where nodes correspond to |
152 changesets and edges imply a parent -> child relation. This graph | 152 changesets and edges imply a parent -> child relation. This graph |
153 can be visualized by graphical tools such as :hg:`glog` | 153 can be visualized by graphical tools such as :hg:`glog` |
154 (graphlog). In mercurial, the DAG is limited by the requirement | 154 (graphlog). In Mercurial, the DAG is limited by the requirement |
155 for children to have at most two parents. | 155 for children to have at most two parents. |
156 | 156 |
157 Default branch | 157 Default branch |
158 See 'Branch, default'. | 158 See 'Branch, default'. |
159 | 159 |
320 encoding, with occasional full revision of data followed by delta | 320 encoding, with occasional full revision of data followed by delta |
321 of each successive revision. It includes data and an index | 321 of each successive revision. It includes data and an index |
322 pointing to the data. | 322 pointing to the data. |
323 | 323 |
324 Rewriting history | 324 Rewriting history |
325 See 'History, rewriting'. | 325 See 'History, rewriting'. |
326 | 326 |
327 Root | 327 Root |
328 A changeset that has only the null changeset as its parent. Most | 328 A changeset that has only the null changeset as its parent. Most |
329 repositories have only a single root changeset. | 329 repositories have only a single root changeset. |
330 | 330 |
340 branch tip may be different in different cloned repositories. | 340 branch tip may be different in different cloned repositories. |
341 | 341 |
342 Update | 342 Update |
343 (Noun) Another synonym of changeset. | 343 (Noun) Another synonym of changeset. |
344 | 344 |
345 Example: "I've pushed an update". | 345 Example: "I've pushed an update". |
346 | 346 |
347 (Verb) This term is usually used to describe updating the state of | 347 (Verb) This term is usually used to describe updating the state of |
348 the working directory to that of a specific changeset. See | 348 the working directory to that of a specific changeset. See |
349 :hg:`help update`. | 349 :hg:`help update`. |
350 | 350 |
352 | 352 |
353 Working directory | 353 Working directory |
354 See 'Directory, working'. | 354 See 'Directory, working'. |
355 | 355 |
356 Working directory parent | 356 Working directory parent |
357 See 'Parent, working directory'. | 357 See 'Parent, working directory'. |