mercurial/help/glossary.txt
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 22 Jun 2017 14:04:13 -0700
changeset 33037 d765ad56081f
parent 26097 220ee13946d3
permissions -rw-r--r--
bundle: make combinechangegroupresults() take a bundleoperation Both callers have a bundleoperation. Passing it in lets us share a bit more code.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     1
Ancestor
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     2
    Any changeset that can be reached by an unbroken chain of parent
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     3
    changesets from a given changeset. More precisely, the ancestors
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     4
    of a changeset can be defined by two properties: a parent of a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     5
    changeset is an ancestor, and a parent of an ancestor is an
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     6
    ancestor. See also: 'Descendant'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
     7
14630
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
     8
Bookmark
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
     9
    Bookmarks are pointers to certain commits that move when
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    10
    committing. They are similar to tags in that it is possible to use
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    11
    bookmark names in all places where Mercurial expects a changeset
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    12
    ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    13
    when you make a commit.
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    14
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    15
    Bookmarks can be renamed, copied and deleted. Bookmarks are local,
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    16
    unless they are explicitly pushed or pulled between repositories.
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    17
    Pushing and pulling bookmarks allow you to collaborate with others
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    18
    on a branch without creating a named branch.
f536151d392f glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com>
parents: 14629
diff changeset
    19
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    20
Branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    21
    (Noun) A child changeset that has been created from a parent that
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    22
    is not a head. These are known as topological branches, see
11437
9fa255c32406 help: glossary.txt formatting fixes
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 11436
diff changeset
    23
    'Branch, topological'. If a topological branch is named, it becomes
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    24
    a named branch. If a topological branch is not named, it becomes
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    25
    an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    26
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    27
    Branches may be created when changes are pulled from or pushed to
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    28
    a remote repository, since new heads may be created by these
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    29
    operations. Note that the term branch can also be used informally
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    30
    to describe a development process in which certain development is
11685
aade8f133d11 cleanup: typos
Patrick Mezard <pmezard@gmail.com>
parents: 11511
diff changeset
    31
    done independently of other development. This is sometimes done
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    32
    explicitly with a named branch, but it can also be done locally,
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    33
    using bookmarks or clones and anonymous branches.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    34
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
    35
    Example: "The experimental branch."
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    36
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    37
    (Verb) The action of creating a child changeset which results in
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    38
    its parent having more than one child.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    39
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
    40
    Example: "I'm going to branch at X."
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    41
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    42
Branch, anonymous
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    43
    Every time a new child changeset is created from a parent that is not
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    44
    a head and the name of the branch is not changed, a new anonymous
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    45
    branch is created.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    46
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    47
Branch, closed
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    48
    A named branch whose branch heads have all been closed.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    49
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    50
Branch, default
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    51
    The branch assigned to a changeset when no name has previously been
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    52
    assigned.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    53
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    54
Branch head
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    55
    See 'Head, branch'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    56
11911
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    57
Branch, inactive
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    58
    If a named branch has no topological heads, it is considered to be
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    59
    inactive. As an example, a feature branch becomes inactive when it
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    60
    is merged into the default branch. The :hg:`branches` command
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    61
    shows inactive branches by default, though they can be hidden with
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    62
    :hg:`branches --active`.
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    63
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    64
    NOTE: this concept is deprecated because it is too implicit.
11927
8e56928e8991 glossary: fixed typo
Martin Geisler <mg@lazybytes.net>
parents: 11911
diff changeset
    65
    Branches should now be explicitly closed using :hg:`commit
11911
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    66
    --close-branch` when they are no longer needed.
528ff7610cba glossary: add entry for "Branch, inactive"
Martin Geisler <mg@lazybytes.net>
parents: 11511
diff changeset
    67
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    68
Branch, named
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    69
    A collection of changesets which have the same branch name. By
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    70
    default, children of a changeset in a named branch belong to the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    71
    same named branch. A child can be explicitly assigned to a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    72
    different branch. See :hg:`help branch`, :hg:`help branches` and
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    73
    :hg:`commit --close-branch` for more information on managing
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    74
    branches.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    75
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    76
    Named branches can be thought of as a kind of namespace, dividing
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    77
    the collection of changesets that comprise the repository into a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    78
    collection of disjoint subsets. A named branch is not necessarily
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    79
    a topological branch. If a new named branch is created from the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    80
    head of another named branch, or the default branch, but no
11436
45eadf71df22 help: fix glossary.txt named branches description
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 11356
diff changeset
    81
    further changesets are added to that previous branch, then that
45eadf71df22 help: fix glossary.txt named branches description
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 11356
diff changeset
    82
    previous branch will be a branch in name only.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    83
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    84
Branch tip
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    85
    See 'Tip, branch'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    86
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    87
Branch, topological
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    88
    Every time a new child changeset is created from a parent that is
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    89
    not a head, a new topological branch is created. If a topological
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    90
    branch is named, it becomes a named branch. If a topological
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    91
    branch is not named, it becomes an anonymous branch of the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    92
    current, possibly default, branch.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    93
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    94
Changelog
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    95
    A record of the changesets in the order in which they were added
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    96
    to the repository. This includes details such as changeset id,
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    97
    author, commit message, date, and list of changed files.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    98
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
    99
Changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   100
    A snapshot of the state of the repository used to record a change.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   101
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   102
Changeset, child
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   103
    The converse of parent changeset: if P is a parent of C, then C is
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   104
    a child of P. There is no limit to the number of children that a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   105
    changeset may have.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   106
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   107
Changeset id
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   108
    A SHA-1 hash that uniquely identifies a changeset. It may be
11718
3e979f47a4c9 help: fix bytes/digit confusion for hashes
Matt Mackall <mpm@selenic.com>
parents: 11685
diff changeset
   109
    represented as either a "long" 40 hexadecimal digit string, or a
3e979f47a4c9 help: fix bytes/digit confusion for hashes
Matt Mackall <mpm@selenic.com>
parents: 11685
diff changeset
   110
    "short" 12 hexadecimal digit string.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   111
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   112
Changeset, merge
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   113
    A changeset with two parents. This occurs when a merge is
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   114
    committed.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   115
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   116
Changeset, parent
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   117
    A revision upon which a child changeset is based. Specifically, a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   118
    parent changeset of a changeset C is a changeset whose node
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   119
    immediately precedes C in the DAG. Changesets have at most two
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   120
    parents.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   121
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   122
Checkout
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   123
    (Noun) The working directory being updated to a specific
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   124
    revision. This use should probably be avoided where possible, as
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   125
    changeset is much more appropriate than checkout in this context.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   126
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   127
    Example: "I'm using checkout X."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   128
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   129
    (Verb) Updating the working directory to a specific changeset. See
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   130
    :hg:`help update`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   131
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   132
    Example: "I'm going to check out changeset X."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   133
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   134
Child changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   135
    See 'Changeset, child'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   136
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   137
Close changeset
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
   138
    See 'Head, closed branch'.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   139
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   140
Closed branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   141
    See 'Branch, closed'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   142
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   143
Clone
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   144
    (Noun) An entire or partial copy of a repository. The partial
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   145
    clone must be in the form of a revision and its ancestors.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   146
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
   147
    Example: "Is your clone up to date?"
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   148
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   149
    (Verb) The process of creating a clone, using :hg:`clone`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   150
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
   151
    Example: "I'm going to clone the repository."
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   152
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   153
Closed branch head
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   154
    See 'Head, closed branch'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   155
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   156
Commit
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   157
    (Noun) A synonym for changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   158
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   159
    Example: "Is the bug fixed in your recent commit?"
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   160
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   161
    (Verb) The act of recording changes to a repository. When files
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   162
    are committed in a working directory, Mercurial finds the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   163
    differences between the committed files and their parent
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   164
    changeset, creating a new changeset in the repository.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   165
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   166
    Example: "You should commit those changes now."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   167
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   168
Cset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   169
    A common abbreviation of the term changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   170
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   171
DAG
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   172
    The repository of changesets of a distributed version control
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   173
    system (DVCS) can be described as a directed acyclic graph (DAG),
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   174
    consisting of nodes and edges, where nodes correspond to
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   175
    changesets and edges imply a parent -> child relation. This graph
20147
7547bcc1a3ad glossary: don't mention obsolete graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16502
diff changeset
   176
    can be visualized by graphical tools such as :hg:`log --graph`. In
7547bcc1a3ad glossary: don't mention obsolete graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16502
diff changeset
   177
    Mercurial, the DAG is limited by the requirement for children to
7547bcc1a3ad glossary: don't mention obsolete graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16502
diff changeset
   178
    have at most two parents.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   179
23027
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   180
Deprecated
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   181
    Feature removed from documentation, but not scheduled for removal.
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   182
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   183
Default branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   184
    See 'Branch, default'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   185
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   186
Descendant
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   187
    Any changeset that can be reached by a chain of child changesets
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   188
    from a given changeset. More precisely, the descendants of a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   189
    changeset can be defined by two properties: the child of a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   190
    changeset is a descendant, and the child of a descendant is a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   191
    descendant. See also: 'Ancestor'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   192
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   193
Diff
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   194
    (Noun) The difference between the contents and attributes of files
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   195
    in two changesets or a changeset and the current working
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   196
    directory. The difference is usually represented in a standard
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   197
    form called a "diff" or "patch". The "git diff" format is used
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   198
    when the changes include copies, renames, or changes to file
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   199
    attributes, none of which can be represented/handled by classic
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   200
    "diff" and "patch".
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   201
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   202
    Example: "Did you see my correction in the diff?"
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   203
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   204
    (Verb) Diffing two changesets is the action of creating a diff or
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   205
    patch.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   206
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   207
    Example: "If you diff with changeset X, you will see what I mean."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   208
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   209
Directory, working
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   210
    The working directory represents the state of the files tracked by
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   211
    Mercurial, that will be recorded in the next commit. The working
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   212
    directory initially corresponds to the snapshot at an existing
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   213
    changeset, known as the parent of the working directory. See
11511
9d905b9769af glossary: fixed typo in "Directory, working" description
Renato Cunha <renatoc@gmail.com>
parents: 11437
diff changeset
   214
    'Parent, working directory'. The state may be modified by changes
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   215
    to the files introduced manually or by a merge. The repository
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   216
    metadata exists in the .hg directory inside the working directory.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   217
16037
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   218
Draft
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   219
    Changesets in the draft phase have not been shared with publishing
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   220
    repositories and may thus be safely changed by history-modifying
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   221
    extensions. See :hg:`help phases`.
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   222
23027
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   223
Experimental
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   224
    Feature that may change or be removed at a later date.
3971f64d7a25 glossary: add deprecated and experimental
Matt Mackall <mpm@selenic.com>
parents: 20147
diff changeset
   225
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   226
Graph
20147
7547bcc1a3ad glossary: don't mention obsolete graphlog extension
Martin Geisler <martin@geisler.net>
parents: 16502
diff changeset
   227
    See DAG and :hg:`log --graph`.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   228
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   229
Head
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   230
    The term 'head' may be used to refer to both a branch head or a
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   231
    repository head, depending on the context. See 'Head, branch' and
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   232
    'Head, repository' for specific definitions.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   233
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   234
    Heads are where development generally takes place and are the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   235
    usual targets for update and merge operations.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   236
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   237
Head, branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   238
    A changeset with no descendants on the same named branch.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   239
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   240
Head, closed branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   241
    A changeset that marks a head as no longer interesting. The closed
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   242
    head is no longer listed by :hg:`heads`. A branch is considered
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   243
    closed when all its heads are closed and consequently is not
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   244
    listed by :hg:`branches`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   245
16502
8298d220cbf9 doc: add description about re-opening closed heads to 'Head, closed branch' in glossary
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16501
diff changeset
   246
    Closed heads can be re-opened by committing new changeset as the
8298d220cbf9 doc: add description about re-opening closed heads to 'Head, closed branch' in glossary
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16501
diff changeset
   247
    child of the changeset that marks a head as closed.
8298d220cbf9 doc: add description about re-opening closed heads to 'Head, closed branch' in glossary
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16501
diff changeset
   248
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   249
Head, repository
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   250
    A topological head which has not been closed.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   251
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   252
Head, topological
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   253
    A changeset with no children in the repository.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   254
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   255
History, immutable
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   256
    Once committed, changesets cannot be altered.  Extensions which
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   257
    appear to change history actually create new changesets that
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   258
    replace existing ones, and then destroy the old changesets. Doing
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   259
    so in public repositories can result in old changesets being
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   260
    reintroduced to the repository.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   261
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   262
History, rewriting
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   263
    The changesets in a repository are immutable. However, extensions
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   264
    to Mercurial can be used to alter the repository, usually in such
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   265
    a way as to preserve changeset contents.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   266
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   267
Immutable history
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   268
    See 'History, immutable'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   269
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   270
Merge changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   271
    See 'Changeset, merge'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   272
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   273
Manifest
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   274
    Each changeset has a manifest, which is the list of files that are
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   275
    tracked by the changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   276
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   277
Merge
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   278
    Used to bring together divergent branches of work. When you update
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   279
    to a changeset and then merge another changeset, you bring the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   280
    history of the latter changeset into your working directory. Once
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   281
    conflicts are resolved (and marked), this merge may be committed
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   282
    as a merge changeset, bringing two branches together in the DAG.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   283
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   284
Named branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   285
    See 'Branch, named'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   286
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   287
Null changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   288
    The empty changeset. It is the parent state of newly-initialized
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   289
    repositories and repositories with no checked out revision. It is
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   290
    thus the parent of root changesets and the effective ancestor when
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   291
    merging unrelated changesets. Can be specified by the alias 'null'
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   292
    or by the changeset ID '000000000000'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   293
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   294
Parent
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   295
    See 'Changeset, parent'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   296
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   297
Parent changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   298
    See 'Changeset, parent'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   299
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   300
Parent, working directory
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   301
    The working directory parent reflects a virtual revision which is
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   302
    the child of the changeset (or two changesets with an uncommitted
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   303
    merge) shown by :hg:`parents`. This is changed with
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   304
    :hg:`update`. Other commands to see the working directory parent
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   305
    are :hg:`summary` and :hg:`id`. Can be specified by the alias ".".
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   306
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   307
Patch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   308
    (Noun) The product of a diff operation.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   309
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   310
    Example: "I've sent you my patch."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   311
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   312
    (Verb) The process of using a patch file to transform one
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   313
    changeset into another.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   314
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   315
    Example: "You will need to patch that revision."
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   316
16037
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   317
Phase
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   318
    A per-changeset state tracking how the changeset has been or
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   319
    should be shared. See :hg:`help phases`.
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   320
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   321
Public
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   322
    Changesets in the public phase have been shared with publishing
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   323
    repositories and are therefore considered immutable. See :hg:`help
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   324
    phases`.
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   325
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   326
Pull
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   327
    An operation in which changesets in a remote repository which are
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   328
    not in the local repository are brought into the local
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   329
    repository. Note that this operation without special arguments
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   330
    only updates the repository, it does not update the files in the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   331
    working directory. See :hg:`help pull`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   332
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   333
Push
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   334
    An operation in which changesets in a local repository which are
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   335
    not in a remote repository are sent to the remote repository. Note
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   336
    that this operation only adds changesets which have been committed
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   337
    locally to the remote repository. Uncommitted changes are not
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   338
    sent. See :hg:`help push`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   339
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   340
Repository
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   341
    The metadata describing all recorded states of a collection of
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   342
    files. Each recorded state is represented by a changeset. A
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   343
    repository is usually (but not always) found in the ``.hg``
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   344
    subdirectory of a working directory. Any recorded state can be
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   345
    recreated by "updating" a working directory to a specific
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   346
    changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   347
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   348
Repository head
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   349
    See 'Head, repository'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   350
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   351
Revision
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   352
    A state of the repository at some point in time. Earlier revisions
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   353
    can be updated to by using :hg:`update`.  See also 'Revision
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   354
    number'; See also 'Changeset'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   355
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   356
Revision number
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   357
    This integer uniquely identifies a changeset in a specific
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   358
    repository. It represents the order in which changesets were added
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   359
    to a repository, starting with revision number 0. Note that the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   360
    revision number may be different in each clone of a repository. To
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   361
    identify changesets uniquely between different clones, see
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   362
    'Changeset id'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   363
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   364
Revlog
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   365
    History storage mechanism used by Mercurial. It is a form of delta
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   366
    encoding, with occasional full revision of data followed by delta
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   367
    of each successive revision. It includes data and an index
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   368
    pointing to the data.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   369
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   370
Rewriting history
11437
9fa255c32406 help: glossary.txt formatting fixes
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 11436
diff changeset
   371
    See 'History, rewriting'.
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   372
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   373
Root
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   374
    A changeset that has only the null changeset as its parent. Most
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   375
    repositories have only a single root changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   376
16037
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   377
Secret
16039
093b75c7b44b pull: return 1 when no changes found (BC)
Matt Mackall <mpm@selenic.com>
parents: 16037
diff changeset
   378
    Changesets in the secret phase may not be shared via push, pull,
093b75c7b44b pull: return 1 when no changes found (BC)
Matt Mackall <mpm@selenic.com>
parents: 16037
diff changeset
   379
    or clone. See :hg:`help phases`.
16037
9232fa4fd1ba glossary: add phase terms
Matt Mackall <mpm@selenic.com>
parents: 14630
diff changeset
   380
14629
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   381
Tag
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   382
    An alternative name given to a changeset. Tags can be used in all
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   383
    places where Mercurial expects a changeset ID, e.g., with
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   384
    :hg:`update`. The creation of a tag is stored in the history and
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   385
    will thus automatically be shared with other using push and pull.
c3f2152e423d glossary: add entry for "Tag"
Martin Geisler <mg@aragost.com>
parents: 11937
diff changeset
   386
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   387
Tip
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   388
    The changeset with the highest revision number. It is the changeset
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   389
    most recently added in a repository.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   390
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   391
Tip, branch
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   392
    The head of a given branch with the highest revision number. When
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   393
    a branch name is used as a revision identifier, it refers to the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   394
    branch tip. See also 'Branch, head'. Note that because revision
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   395
    numbers may be different in different repository clones, the
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   396
    branch tip may be different in different cloned repositories.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   397
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   398
Update
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   399
    (Noun) Another synonym of changeset.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   400
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
   401
    Example: "I've pushed an update."
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   402
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   403
    (Verb) This term is usually used to describe updating the state of
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   404
    the working directory to that of a specific changeset. See
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   405
    :hg:`help update`.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   406
26097
220ee13946d3 glossary: fixup use of periods at end of entries
timeless@mozdev.org
parents: 23027
diff changeset
   407
    Example: "You should update."
11356
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   408
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   409
Working directory
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   410
    See 'Directory, working'.
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   411
511445840148 help: add "glossary" topic
Faheem Mitha <faheem@email.unc.edu>
parents:
diff changeset
   412
Working directory parent
11437
9fa255c32406 help: glossary.txt formatting fixes
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 11436
diff changeset
   413
    See 'Parent, working directory'.