summaryrefslogtreecommitdiff
path: root/mercurial/help/glossary.txt
diff options
context:
space:
mode:
Diffstat (limited to 'mercurial/help/glossary.txt')
-rw-r--r--mercurial/help/glossary.txt23
1 files changed, 1 insertions, 22 deletions
diff --git a/mercurial/help/glossary.txt b/mercurial/help/glossary.txt
index 59a9d03..074a31d 100644
--- a/mercurial/help/glossary.txt
+++ b/mercurial/help/glossary.txt
@@ -135,7 +135,7 @@ Child changeset
See 'Changeset, child'.
Close changeset
- See 'Head, closed branch'
+ See 'Changeset, close'.
Closed branch
See 'Branch, closed'.
@@ -212,11 +212,6 @@ Directory, working
to the files introduced manually or by a merge. The repository
metadata exists in the .hg directory inside the working directory.
-Draft
- Changesets in the draft phase have not been shared with publishing
- repositories and may thus be safely changed by history-modifying
- extensions. See :hg:`help phases`.
-
Graph
See DAG and :hg:`help graphlog`.
@@ -237,9 +232,6 @@ Head, closed branch
closed when all its heads are closed and consequently is not
listed by :hg:`branches`.
- Closed heads can be re-opened by committing new changeset as the
- child of the changeset that marks a head as closed.
-
Head, repository
A topological head which has not been closed.
@@ -308,15 +300,6 @@ Patch
Example: "You will need to patch that revision."
-Phase
- A per-changeset state tracking how the changeset has been or
- should be shared. See :hg:`help phases`.
-
-Public
- Changesets in the public phase have been shared with publishing
- repositories and are therefore considered immutable. See :hg:`help
- phases`.
-
Pull
An operation in which changesets in a remote repository which are
not in the local repository are brought into the local
@@ -368,10 +351,6 @@ Root
A changeset that has only the null changeset as its parent. Most
repositories have only a single root changeset.
-Secret
- Changesets in the secret phase may not be shared via push, pull,
- or clone. See :hg:`help phases`.
-
Tag
An alternative name given to a changeset. Tags can be used in all
places where Mercurial expects a changeset ID, e.g., with