Diff for "Head" - Mercurial

Differences between revisions 7 and 15 (spanning 8 versions)

Head

hg heads [-r REV] [REV]...

A head is a changeset with no child changesets. The tip is the most recently changed head. Other heads are recent pulls into a repository that have not yet been merged.

If you have just made a commit, that commit will be the tip. Alternately, if you have just pulled from another repository, the tip of that repository becomes the current tip.

Mercurial supports multiple heads concurrently within a single repository.

Help text: http://www.selenic.com/mercurial/hg.1.html#heads

Definitions

(from http://selenic.com/pipermail/mercurial-devel/2009-June/013030.html)

head: a changeset that has no children
branch: the set of all changesets with the same branch name
branch head: a changeset in a branch that has no children in that branch (not the same as head!)
active branch head: a branch head that is also a head
inactive branch head: a branch head that has a child not in the same branch
closed branch head: a branch head with a closed marker
closed branch: a branch with only closed heads

CategoryCommand CategoryGlossary

-  ⇤ ← Revision 7 as of 2008-04-19 23:39:33 → 
  Size: 1493
  Editor: abuehl
  Comment:
+   ← Revision 15 as of 2009-06-09 17:13:39 → ⇥
  Size: 1873
  Editor: abuehl
  Comment: +Definitions
-Deletions are marked like this.
+Additions are marked like this.
 Line 5:
-A '''head''' is a [:ChangeSet:changeset] with no children.  The [:Tip:tip] is the most recently changed head. Other heads are recent [:Pull:pulls] into a [:Repository:repository] that have not yet been [:Merge:merged].
+A '''head''' is a [[ChangeSet|changeset]] with no child changesets.  The [[Tip|tip]] is the most recently changed head. Other heads are recent [[Pull|pulls]] into a [[Repository|repository]] that have not yet been [[Merge|merged]].
 Line 7:
-If you have just made a [:Commit:commit], that commit will be
+{{{#!dot
digraph {
   rankdir = LR
   node [shape=record]
   rev0 [label="{{<p1> p1 | <p2> p2} | rev 0:838e}"];
   rev1 [label="{{<p1> p1 | <p2> p2} | rev 1:34ef}"];
   rev2 [label="{{<p1> p1 | <p2> p2} | rev 2:4563}", color=red];
   rev3 [label="{{<p1> p1 | <p2> p2} | rev 3:fe56 (tip)}", color=red];
   workingdir [label="{{<p1> p1 | <p2> p2} | working directory}"];
   rev0 -> rev1:p1 [dir=back, label="parent"]
   rev1 -> rev2:p1 [dir=back]
   rev1 -> rev3:p1 [dir=back]
   rev3 -> workingdir:p1 [dir=back]
   label = "sample repo with two heads (rev2 and rev3)"
}
}}}

If you have just made a [[Commit|commit]], that commit will be
-Line 11:
+Line 28:
-Mercurial supports [:MultipleHeads:multiple heads] concurrently within a single repository.
+Mercurial supports [[MultipleHeads|multiple heads]] concurrently within a single repository.
-Line 13:
+Line 30:
-=== Help text ===
{{{
hg heads [-r REV] [REV]...
+Help text: http://www.selenic.com/mercurial/hg.1.html#heads
-Line 17:
+Line 32:
-show current repository heads or show branch heads
+See also: [[Branch]], [[WorkingDirectory]]
-Line 19:
+Line 34:
-    With no arguments, show all repository head changesets.
+=== Definitions ===
''(from http://selenic.com/pipermail/mercurial-devel/2009-June/013030.html)''
-Line 21:
+Line 37:
-    If branch or revisions names are given this will show the heads of
    the specified branches or the branches those revisions are tagged
    with.
+ head:: a changeset that has no children
-Line 25:
+Line 39:
-    Repository "heads" are changesets that don't have child
    changesets. They are where development generally takes place and
    are the usual targets for update and merge operations.
+ branch:: the set of all changesets with the same branch name
-Line 29:
+Line 41:
-    Branch heads are changesets that have a given branch tag, but have
    no child changesets with that tag. They are usually where
    development on the given branch takes place.
+ branch head:: a changeset in a branch that has no children in that branch (not the same as head!)
-Line 33:
+Line 43:
-options:
+ active branch head:: a branch head that is also a head
-Line 35:
+Line 45:
- -r --rev       show only heads which are descendants of rev
    --style     display using template map file
    --template  display with template
}}}
+ inactive branch head:: a branch head that has a child not in the same branch
-Line 40:
+Line 47:
-See also: ["Branch"]
+ closed branch head:: a branch head with a closed marker

 closed branch:: a branch with only closed heads