##// END OF EJS Templates
glossary: fixed typo
Martin Geisler -
r11927:8e56928e stable
parent child Browse files
Show More
@@ -1,368 +1,368 b''
1 Ancestor
1 Ancestor
2 Any changeset that can be reached by an unbroken chain of parent
2 Any changeset that can be reached by an unbroken chain of parent
3 changesets from a given changeset. More precisely, the ancestors
3 changesets from a given changeset. More precisely, the ancestors
4 of a changeset can be defined by two properties: a parent of a
4 of a changeset can be defined by two properties: a parent of a
5 changeset is an ancestor, and a parent of an ancestor is an
5 changeset is an ancestor, and a parent of an ancestor is an
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
17 operations. Note that the term branch can also be used informally
17 operations. Note that the term branch can also be used informally
18 to describe a development process in which certain development is
18 to describe a development process in which certain development is
19 done independently of other development.This is sometimes done
19 done independently of other development.This is sometimes done
20 explicitly with a named branch, but it can also be done locally,
20 explicitly with a named branch, but it can also be done locally,
21 using bookmarks or clones and anonymous branches.
21 using bookmarks or clones and anonymous branches.
22
22
23 Example: "The experimental branch".
23 Example: "The experimental branch".
24
24
25 (Verb) The action of creating a child changeset which results in
25 (Verb) The action of creating a child changeset which results in
26 its parent having more than one child.
26 its parent having more than one child.
27
27
28 Example: "I'm going to branch at X".
28 Example: "I'm going to branch at X".
29
29
30 Branch, anonymous
30 Branch, anonymous
31 Every time a new child changeset is created from a parent that is not
31 Every time a new child changeset is created from a parent that is not
32 a head and the name of the branch is not changed, a new anonymous
32 a head and the name of the branch is not changed, a new anonymous
33 branch is created.
33 branch is created.
34
34
35 Branch, closed
35 Branch, closed
36 A named branch whose branch heads have all been closed.
36 A named branch whose branch heads have all been closed.
37
37
38 Branch, default
38 Branch, default
39 The branch assigned to a changeset when no name has previously been
39 The branch assigned to a changeset when no name has previously been
40 assigned.
40 assigned.
41
41
42 Branch head
42 Branch head
43 See 'Head, branch'.
43 See 'Head, branch'.
44
44
45 Branch, inactive
45 Branch, inactive
46 If a named branch has no topological heads, it is considered to be
46 If a named branch has no topological heads, it is considered to be
47 inactive. As an example, a feature branch becomes inactive when it
47 inactive. As an example, a feature branch becomes inactive when it
48 is merged into the default branch. The :hg:`branches` command
48 is merged into the default branch. The :hg:`branches` command
49 shows inactive branches by default, though they can be hidden with
49 shows inactive branches by default, though they can be hidden with
50 :hg:`branches --active`.
50 :hg:`branches --active`.
51
51
52 NOTE: this concept is deprecated because it is too implicit.
52 NOTE: this concept is deprecated because it is too implicit.
53 Branches show now be explicitly closed using :hg:`commit
53 Branches should now be explicitly closed using :hg:`commit
54 --close-branch` when they are no longer needed.
54 --close-branch` when they are no longer needed.
55
55
56 Branch, named
56 Branch, named
57 A collection of changesets which have the same branch name. By
57 A collection of changesets which have the same branch name. By
58 default, children of a changeset in a named branch belong to the
58 default, children of a changeset in a named branch belong to the
59 same named branch. A child can be explicitly assigned to a
59 same named branch. A child can be explicitly assigned to a
60 different branch. See :hg:`help branch`, :hg:`help branches` and
60 different branch. See :hg:`help branch`, :hg:`help branches` and
61 :hg:`commit --close-branch` for more information on managing
61 :hg:`commit --close-branch` for more information on managing
62 branches.
62 branches.
63
63
64 Named branches can be thought of as a kind of namespace, dividing
64 Named branches can be thought of as a kind of namespace, dividing
65 the collection of changesets that comprise the repository into a
65 the collection of changesets that comprise the repository into a
66 collection of disjoint subsets. A named branch is not necessarily
66 collection of disjoint subsets. A named branch is not necessarily
67 a topological branch. If a new named branch is created from the
67 a topological branch. If a new named branch is created from the
68 head of another named branch, or the default branch, but no
68 head of another named branch, or the default branch, but no
69 further changesets are added to that previous branch, then that
69 further changesets are added to that previous branch, then that
70 previous branch will be a branch in name only.
70 previous branch will be a branch in name only.
71
71
72 Branch tip
72 Branch tip
73 See 'Tip, branch'.
73 See 'Tip, branch'.
74
74
75 Branch, topological
75 Branch, topological
76 Every time a new child changeset is created from a parent that is
76 Every time a new child changeset is created from a parent that is
77 not a head, a new topological branch is created. If a topological
77 not a head, a new topological branch is created. If a topological
78 branch is named, it becomes a named branch. If a topological
78 branch is named, it becomes a named branch. If a topological
79 branch is not named, it becomes an anonymous branch of the
79 branch is not named, it becomes an anonymous branch of the
80 current, possibly default, branch.
80 current, possibly default, branch.
81
81
82 Changelog
82 Changelog
83 A record of the changesets in the order in which they were added
83 A record of the changesets in the order in which they were added
84 to the repository. This includes details such as changeset id,
84 to the repository. This includes details such as changeset id,
85 author, commit message, date, and list of changed files.
85 author, commit message, date, and list of changed files.
86
86
87 Changeset
87 Changeset
88 A snapshot of the state of the repository used to record a change.
88 A snapshot of the state of the repository used to record a change.
89
89
90 Changeset, child
90 Changeset, child
91 The converse of parent changeset: if P is a parent of C, then C is
91 The converse of parent changeset: if P is a parent of C, then C is
92 a child of P. There is no limit to the number of children that a
92 a child of P. There is no limit to the number of children that a
93 changeset may have.
93 changeset may have.
94
94
95 Changeset id
95 Changeset id
96 A SHA-1 hash that uniquely identifies a changeset. It may be
96 A SHA-1 hash that uniquely identifies a changeset. It may be
97 represented as either a "long" 40-byte hexadecimal string, or a
97 represented as either a "long" 40-byte hexadecimal string, or a
98 "short" 12-byte hexadecimal string.
98 "short" 12-byte hexadecimal string.
99
99
100 Changeset, merge
100 Changeset, merge
101 A changeset with two parents. This occurs when a merge is
101 A changeset with two parents. This occurs when a merge is
102 committed.
102 committed.
103
103
104 Changeset, parent
104 Changeset, parent
105 A revision upon which a child changeset is based. Specifically, a
105 A revision upon which a child changeset is based. Specifically, a
106 parent changeset of a changeset C is a changeset whose node
106 parent changeset of a changeset C is a changeset whose node
107 immediately precedes C in the DAG. Changesets have at most two
107 immediately precedes C in the DAG. Changesets have at most two
108 parents.
108 parents.
109
109
110 Checkout
110 Checkout
111 (Noun) The working directory being updated to a specific
111 (Noun) The working directory being updated to a specific
112 revision. This use should probably be avoided where possible, as
112 revision. This use should probably be avoided where possible, as
113 changeset is much more appropriate than checkout in this context.
113 changeset is much more appropriate than checkout in this context.
114
114
115 Example: "I'm using checkout X."
115 Example: "I'm using checkout X."
116
116
117 (Verb) Updating the working directory to a specific changeset. See
117 (Verb) Updating the working directory to a specific changeset. See
118 :hg:`help update`.
118 :hg:`help update`.
119
119
120 Example: "I'm going to check out changeset X."
120 Example: "I'm going to check out changeset X."
121
121
122 Child changeset
122 Child changeset
123 See 'Changeset, child'.
123 See 'Changeset, child'.
124
124
125 Close changeset
125 Close changeset
126 See 'Changeset, close'.
126 See 'Changeset, close'.
127
127
128 Closed branch
128 Closed branch
129 See 'Branch, closed'.
129 See 'Branch, closed'.
130
130
131 Clone
131 Clone
132 (Noun) An entire or partial copy of a repository. The partial
132 (Noun) An entire or partial copy of a repository. The partial
133 clone must be in the form of a revision and its ancestors.
133 clone must be in the form of a revision and its ancestors.
134
134
135 Example: "Is your clone up to date?".
135 Example: "Is your clone up to date?".
136
136
137 (Verb) The process of creating a clone, using :hg:`clone`.
137 (Verb) The process of creating a clone, using :hg:`clone`.
138
138
139 Example: "I'm going to clone the repository".
139 Example: "I'm going to clone the repository".
140
140
141 Closed branch head
141 Closed branch head
142 See 'Head, closed branch'.
142 See 'Head, closed branch'.
143
143
144 Commit
144 Commit
145 (Noun) A synonym for changeset.
145 (Noun) A synonym for changeset.
146
146
147 Example: "Is the bug fixed in your recent commit?"
147 Example: "Is the bug fixed in your recent commit?"
148
148
149 (Verb) The act of recording changes to a repository. When files
149 (Verb) The act of recording changes to a repository. When files
150 are committed in a working directory, Mercurial finds the
150 are committed in a working directory, Mercurial finds the
151 differences between the committed files and their parent
151 differences between the committed files and their parent
152 changeset, creating a new changeset in the repository.
152 changeset, creating a new changeset in the repository.
153
153
154 Example: "You should commit those changes now."
154 Example: "You should commit those changes now."
155
155
156 Cset
156 Cset
157 A common abbreviation of the term changeset.
157 A common abbreviation of the term changeset.
158
158
159 DAG
159 DAG
160 The repository of changesets of a distributed version control
160 The repository of changesets of a distributed version control
161 system (DVCS) can be described as a directed acyclic graph (DAG),
161 system (DVCS) can be described as a directed acyclic graph (DAG),
162 consisting of nodes and edges, where nodes correspond to
162 consisting of nodes and edges, where nodes correspond to
163 changesets and edges imply a parent -> child relation. This graph
163 changesets and edges imply a parent -> child relation. This graph
164 can be visualized by graphical tools such as :hg:`glog`
164 can be visualized by graphical tools such as :hg:`glog`
165 (graphlog). In Mercurial, the DAG is limited by the requirement
165 (graphlog). In Mercurial, the DAG is limited by the requirement
166 for children to have at most two parents.
166 for children to have at most two parents.
167
167
168 Default branch
168 Default branch
169 See 'Branch, default'.
169 See 'Branch, default'.
170
170
171 Descendant
171 Descendant
172 Any changeset that can be reached by a chain of child changesets
172 Any changeset that can be reached by a chain of child changesets
173 from a given changeset. More precisely, the descendants of a
173 from a given changeset. More precisely, the descendants of a
174 changeset can be defined by two properties: the child of a
174 changeset can be defined by two properties: the child of a
175 changeset is a descendant, and the child of a descendant is a
175 changeset is a descendant, and the child of a descendant is a
176 descendant. See also: 'Ancestor'.
176 descendant. See also: 'Ancestor'.
177
177
178 Diff
178 Diff
179 (Noun) The difference between the contents and attributes of files
179 (Noun) The difference between the contents and attributes of files
180 in two changesets or a changeset and the current working
180 in two changesets or a changeset and the current working
181 directory. The difference is usually represented in a standard
181 directory. The difference is usually represented in a standard
182 form called a "diff" or "patch". The "git diff" format is used
182 form called a "diff" or "patch". The "git diff" format is used
183 when the changes include copies, renames, or changes to file
183 when the changes include copies, renames, or changes to file
184 attributes, none of which can be represented/handled by classic
184 attributes, none of which can be represented/handled by classic
185 "diff" and "patch".
185 "diff" and "patch".
186
186
187 Example: "Did you see my correction in the diff?"
187 Example: "Did you see my correction in the diff?"
188
188
189 (Verb) Diffing two changesets is the action of creating a diff or
189 (Verb) Diffing two changesets is the action of creating a diff or
190 patch.
190 patch.
191
191
192 Example: "If you diff with changeset X, you will see what I mean."
192 Example: "If you diff with changeset X, you will see what I mean."
193
193
194 Directory, working
194 Directory, working
195 The working directory represents the state of the files tracked by
195 The working directory represents the state of the files tracked by
196 Mercurial, that will be recorded in the next commit. The working
196 Mercurial, that will be recorded in the next commit. The working
197 directory initially corresponds to the snapshot at an existing
197 directory initially corresponds to the snapshot at an existing
198 changeset, known as the parent of the working directory. See
198 changeset, known as the parent of the working directory. See
199 'Parent, working directory'. The state may be modified by changes
199 'Parent, working directory'. The state may be modified by changes
200 to the files introduced manually or by a merge. The repository
200 to the files introduced manually or by a merge. The repository
201 metadata exists in the .hg directory inside the working directory.
201 metadata exists in the .hg directory inside the working directory.
202
202
203 Graph
203 Graph
204 See DAG and :hg:`help graphlog`.
204 See DAG and :hg:`help graphlog`.
205
205
206 Head
206 Head
207 The term 'head' may be used to refer to both a branch head or a
207 The term 'head' may be used to refer to both a branch head or a
208 repository head, depending on the context. See 'Head, branch' and
208 repository head, depending on the context. See 'Head, branch' and
209 'Head, repository' for specific definitions.
209 'Head, repository' for specific definitions.
210
210
211 Heads are where development generally takes place and are the
211 Heads are where development generally takes place and are the
212 usual targets for update and merge operations.
212 usual targets for update and merge operations.
213
213
214 Head, branch
214 Head, branch
215 A changeset with no descendants on the same named branch.
215 A changeset with no descendants on the same named branch.
216
216
217 Head, closed branch
217 Head, closed branch
218 A changeset that marks a head as no longer interesting. The closed
218 A changeset that marks a head as no longer interesting. The closed
219 head is no longer listed by :hg:`heads`. A branch is considered
219 head is no longer listed by :hg:`heads`. A branch is considered
220 closed when all its heads are closed and consequently is not
220 closed when all its heads are closed and consequently is not
221 listed by :hg:`branches`.
221 listed by :hg:`branches`.
222
222
223 Head, repository
223 Head, repository
224 A topological head which has not been closed.
224 A topological head which has not been closed.
225
225
226 Head, topological
226 Head, topological
227 A changeset with no children in the repository.
227 A changeset with no children in the repository.
228
228
229 History, immutable
229 History, immutable
230 Once committed, changesets cannot be altered. Extensions which
230 Once committed, changesets cannot be altered. Extensions which
231 appear to change history actually create new changesets that
231 appear to change history actually create new changesets that
232 replace existing ones, and then destroy the old changesets. Doing
232 replace existing ones, and then destroy the old changesets. Doing
233 so in public repositories can result in old changesets being
233 so in public repositories can result in old changesets being
234 reintroduced to the repository.
234 reintroduced to the repository.
235
235
236 History, rewriting
236 History, rewriting
237 The changesets in a repository are immutable. However, extensions
237 The changesets in a repository are immutable. However, extensions
238 to Mercurial can be used to alter the repository, usually in such
238 to Mercurial can be used to alter the repository, usually in such
239 a way as to preserve changeset contents.
239 a way as to preserve changeset contents.
240
240
241 Immutable history
241 Immutable history
242 See 'History, immutable'.
242 See 'History, immutable'.
243
243
244 Merge changeset
244 Merge changeset
245 See 'Changeset, merge'.
245 See 'Changeset, merge'.
246
246
247 Manifest
247 Manifest
248 Each changeset has a manifest, which is the list of files that are
248 Each changeset has a manifest, which is the list of files that are
249 tracked by the changeset.
249 tracked by the changeset.
250
250
251 Merge
251 Merge
252 Used to bring together divergent branches of work. When you update
252 Used to bring together divergent branches of work. When you update
253 to a changeset and then merge another changeset, you bring the
253 to a changeset and then merge another changeset, you bring the
254 history of the latter changeset into your working directory. Once
254 history of the latter changeset into your working directory. Once
255 conflicts are resolved (and marked), this merge may be committed
255 conflicts are resolved (and marked), this merge may be committed
256 as a merge changeset, bringing two branches together in the DAG.
256 as a merge changeset, bringing two branches together in the DAG.
257
257
258 Named branch
258 Named branch
259 See 'Branch, named'.
259 See 'Branch, named'.
260
260
261 Null changeset
261 Null changeset
262 The empty changeset. It is the parent state of newly-initialized
262 The empty changeset. It is the parent state of newly-initialized
263 repositories and repositories with no checked out revision. It is
263 repositories and repositories with no checked out revision. It is
264 thus the parent of root changesets and the effective ancestor when
264 thus the parent of root changesets and the effective ancestor when
265 merging unrelated changesets. Can be specified by the alias 'null'
265 merging unrelated changesets. Can be specified by the alias 'null'
266 or by the changeset ID '000000000000'.
266 or by the changeset ID '000000000000'.
267
267
268 Parent
268 Parent
269 See 'Changeset, parent'.
269 See 'Changeset, parent'.
270
270
271 Parent changeset
271 Parent changeset
272 See 'Changeset, parent'.
272 See 'Changeset, parent'.
273
273
274 Parent, working directory
274 Parent, working directory
275 The working directory parent reflects a virtual revision which is
275 The working directory parent reflects a virtual revision which is
276 the child of the changeset (or two changesets with an uncommitted
276 the child of the changeset (or two changesets with an uncommitted
277 merge) shown by :hg:`parents`. This is changed with
277 merge) shown by :hg:`parents`. This is changed with
278 :hg:`update`. Other commands to see the working directory parent
278 :hg:`update`. Other commands to see the working directory parent
279 are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
279 are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
280
280
281 Patch
281 Patch
282 (Noun) The product of a diff operation.
282 (Noun) The product of a diff operation.
283
283
284 Example: "I've sent you my patch."
284 Example: "I've sent you my patch."
285
285
286 (Verb) The process of using a patch file to transform one
286 (Verb) The process of using a patch file to transform one
287 changeset into another.
287 changeset into another.
288
288
289 Example: "You will need to patch that revision."
289 Example: "You will need to patch that revision."
290
290
291 Pull
291 Pull
292 An operation in which changesets in a remote repository which are
292 An operation in which changesets in a remote repository which are
293 not in the local repository are brought into the local
293 not in the local repository are brought into the local
294 repository. Note that this operation without special arguments
294 repository. Note that this operation without special arguments
295 only updates the repository, it does not update the files in the
295 only updates the repository, it does not update the files in the
296 working directory. See :hg:`help pull`.
296 working directory. See :hg:`help pull`.
297
297
298 Push
298 Push
299 An operation in which changesets in a local repository which are
299 An operation in which changesets in a local repository which are
300 not in a remote repository are sent to the remote repository. Note
300 not in a remote repository are sent to the remote repository. Note
301 that this operation only adds changesets which have been committed
301 that this operation only adds changesets which have been committed
302 locally to the remote repository. Uncommitted changes are not
302 locally to the remote repository. Uncommitted changes are not
303 sent. See :hg:`help push`.
303 sent. See :hg:`help push`.
304
304
305 Repository
305 Repository
306 The metadata describing all recorded states of a collection of
306 The metadata describing all recorded states of a collection of
307 files. Each recorded state is represented by a changeset. A
307 files. Each recorded state is represented by a changeset. A
308 repository is usually (but not always) found in the ``.hg``
308 repository is usually (but not always) found in the ``.hg``
309 subdirectory of a working directory. Any recorded state can be
309 subdirectory of a working directory. Any recorded state can be
310 recreated by "updating" a working directory to a specific
310 recreated by "updating" a working directory to a specific
311 changeset.
311 changeset.
312
312
313 Repository head
313 Repository head
314 See 'Head, repository'.
314 See 'Head, repository'.
315
315
316 Revision
316 Revision
317 A state of the repository at some point in time. Earlier revisions
317 A state of the repository at some point in time. Earlier revisions
318 can be updated to by using :hg:`update`. See also 'Revision
318 can be updated to by using :hg:`update`. See also 'Revision
319 number'; See also 'Changeset'.
319 number'; See also 'Changeset'.
320
320
321 Revision number
321 Revision number
322 This integer uniquely identifies a changeset in a specific
322 This integer uniquely identifies a changeset in a specific
323 repository. It represents the order in which changesets were added
323 repository. It represents the order in which changesets were added
324 to a repository, starting with revision number 0. Note that the
324 to a repository, starting with revision number 0. Note that the
325 revision number may be different in each clone of a repository. To
325 revision number may be different in each clone of a repository. To
326 identify changesets uniquely between different clones, see
326 identify changesets uniquely between different clones, see
327 'Changeset id'.
327 'Changeset id'.
328
328
329 Revlog
329 Revlog
330 History storage mechanism used by Mercurial. It is a form of delta
330 History storage mechanism used by Mercurial. It is a form of delta
331 encoding, with occasional full revision of data followed by delta
331 encoding, with occasional full revision of data followed by delta
332 of each successive revision. It includes data and an index
332 of each successive revision. It includes data and an index
333 pointing to the data.
333 pointing to the data.
334
334
335 Rewriting history
335 Rewriting history
336 See 'History, rewriting'.
336 See 'History, rewriting'.
337
337
338 Root
338 Root
339 A changeset that has only the null changeset as its parent. Most
339 A changeset that has only the null changeset as its parent. Most
340 repositories have only a single root changeset.
340 repositories have only a single root changeset.
341
341
342 Tip
342 Tip
343 The changeset with the highest revision number. It is the changeset
343 The changeset with the highest revision number. It is the changeset
344 most recently added in a repository.
344 most recently added in a repository.
345
345
346 Tip, branch
346 Tip, branch
347 The head of a given branch with the highest revision number. When
347 The head of a given branch with the highest revision number. When
348 a branch name is used as a revision identifier, it refers to the
348 a branch name is used as a revision identifier, it refers to the
349 branch tip. See also 'Branch, head'. Note that because revision
349 branch tip. See also 'Branch, head'. Note that because revision
350 numbers may be different in different repository clones, the
350 numbers may be different in different repository clones, the
351 branch tip may be different in different cloned repositories.
351 branch tip may be different in different cloned repositories.
352
352
353 Update
353 Update
354 (Noun) Another synonym of changeset.
354 (Noun) Another synonym of changeset.
355
355
356 Example: "I've pushed an update".
356 Example: "I've pushed an update".
357
357
358 (Verb) This term is usually used to describe updating the state of
358 (Verb) This term is usually used to describe updating the state of
359 the working directory to that of a specific changeset. See
359 the working directory to that of a specific changeset. See
360 :hg:`help update`.
360 :hg:`help update`.
361
361
362 Example: "You should update".
362 Example: "You should update".
363
363
364 Working directory
364 Working directory
365 See 'Directory, working'.
365 See 'Directory, working'.
366
366
367 Working directory parent
367 Working directory parent
368 See 'Parent, working directory'.
368 See 'Parent, working directory'.
General Comments 0
You need to be logged in to leave comments. Login now