Mercurial > hg

comparison mercurial/help/glossary.txt @ 16037:9232fa4fd1ba stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
glossary: add phase terms
author Matt Mackall <mpm@selenic.com>
date Mon, 30 Jan 2012 14:44:01 -0600
parents f536151d392f
children 093b75c7b44b
comparison
equal deleted inserted replaced
16036:e6e12e60a45f 16037:9232fa4fd1ba
210 changeset, known as the parent of the working directory. See 210 changeset, known as the parent of the working directory. See
211 'Parent, working directory'. The state may be modified by changes 211 'Parent, working directory'. The state may be modified by changes
212 to the files introduced manually or by a merge. The repository 212 to the files introduced manually or by a merge. The repository
213 metadata exists in the .hg directory inside the working directory. 213 metadata exists in the .hg directory inside the working directory.
214 214
215 Draft
216 Changesets in the draft phase have not been shared with publishing
217 repositories and may thus be safely changed by history-modifying
218 extensions. See :hg:`help phases`.
219
215 Graph 220 Graph
216 See DAG and :hg:`help graphlog`. 221 See DAG and :hg:`help graphlog`.
217 222
218 Head 223 Head
219 The term 'head' may be used to refer to both a branch head or a 224 The term 'head' may be used to refer to both a branch head or a
297 302
298 (Verb) The process of using a patch file to transform one 303 (Verb) The process of using a patch file to transform one
299 changeset into another. 304 changeset into another.
300 305
301 Example: "You will need to patch that revision." 306 Example: "You will need to patch that revision."
307
308 Phase
309 A per-changeset state tracking how the changeset has been or
310 should be shared. See :hg:`help phases`.
311
312 Public
313 Changesets in the public phase have been shared with publishing
314 repositories and are therefore considered immutable. See :hg:`help
315 phases`.
302 316
303 Pull 317 Pull
304 An operation in which changesets in a remote repository which are 318 An operation in which changesets in a remote repository which are
305 not in the local repository are brought into the local 319 not in the local repository are brought into the local
306 repository. Note that this operation without special arguments 320 repository. Note that this operation without special arguments
349 363
350 Root 364 Root
351 A changeset that has only the null changeset as its parent. Most 365 A changeset that has only the null changeset as its parent. Most
352 repositories have only a single root changeset. 366 repositories have only a single root changeset.
353 367
368 Secret
369 Secret changesets are changesets that may not be shared via push
370 or pull. See :hg:`help phases`.
371
354 Tag 372 Tag
355 An alternative name given to a changeset. Tags can be used in all 373 An alternative name given to a changeset. Tags can be used in all
356 places where Mercurial expects a changeset ID, e.g., with 374 places where Mercurial expects a changeset ID, e.g., with
357 :hg:`update`. The creation of a tag is stored in the history and 375 :hg:`update`. The creation of a tag is stored in the history and
358 will thus automatically be shared with other using push and pull. 376 will thus automatically be shared with other using push and pull.