##// END OF EJS Templates
help: glossary.txt formatting fixes
Wagner Bruna -
r11437:9fa255c3 stable
parent child Browse files
Show More
@@ -8,7 +8,7 b' Ancestor'
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
@@ -151,7 +151,7 b' 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
@@ -322,7 +322,7 b' Revlog'
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
@@ -342,7 +342,7 b' Tip, branch'
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
@@ -354,4 +354,4 b' 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'.
General Comments 0
You need to be logged in to leave comments. Login now