|
Size: 2725
Comment:
|
Size: 3966
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 9: | Line 9: |
| Strictly speaking, a branch is created when a user creates a new [:ChangeSet:changeset] in a [:Repository:repository], '''if''' it's [:Parent:parent] changeset already has a child, thus adding a second child changeset to that parent. | Strictly speaking, a branch is created when a user creates a new [:ChangeSet:changeset] C2 in a [:Repository:repository] R0, '''if''' its [:Parent:parent] changeset P already has a child C1, thus adding a second child changeset C2 to that parent P. This adds a new [:Head:head] to R0. |
| Line 11: | Line 11: |
| This creation of a branch can also happen it two different repositories R1 and R2, both containing the same parent changeset P, and a user committing a new changeset C1 in R1 using P as its parent and a second user (or the same user) committing another new changeset C2 in R2 using the same changeset P as parent. From that perspective, each of these repositories may be seen as a "branch" of the other. | {{{#!dot digraph { label="Repository R0" rankdir = LR node [shape=box] " P (a79cd24a138a) " -> " C1 (ebf9d41c4812) " " P (a79cd24a138a) " -> " C2 (3b978afa9ee5) " " C2 (3b978afa9ee5) " [color=red] } }}} |
| Line 13: | Line 22: |
| As such, each changeset in Mercurial forms an element of branch. A changeset thus can be said to "belongs to a branch". Per that definition, a branch is simply a linear sequence of changesets. | |
| Line 15: | Line 23: |
| Mercurial supports giving ''names'' to branches, by using the branch name property of the changeset (see NamedBranches). If no branch name is specified when commiting a new changeset, Mercurial assigns the branch name "default". So the name of the default branch in a repository is "default". | The creation of a branch can also happen in two ''different'' repositories R1 and R2, both containing the same parent changeset P, and a user [:Commit:committing] a new changeset C1 in R1 using P as its parent and a second user (or the same user) committing another new changeset C2 in R2 using the same changeset P as parent. From that perspective, each of these repositories may be seen as a "branch" of the other (see also ["Clone"]). {{{#!dot digraph { label="Repository R1" rankdir = LR node [shape=box] " P (a79cd24a138a) " -> " C1 (ebf9d41c4812) " } }}} {{{#!dot digraph { label="Repository R2" rankdir = LR node [shape=box] " P (a79cd24a138a) " -> " C2 (3b978afa9ee5) " " C2 (3b978afa9ee5) " [color=red] } }}} ''Note:'' after doing a {{{hg --repository R1 pull --rev 3b978afa9ee5 R2}}}, repository R1 will look the same as repository R0 (see ["Pull"]). This finally adds a new head to R1 as well. As such, each changeset in Mercurial forms an element of a branch. A changeset thus can be said to "belong to a branch". Per that definition, a branch is simply a linear sequence of changesets. Mercurial supports giving ''names'' to branches, by using the branch name property of the changeset (see NamedBranches). If no branch name is specified when committing a new changeset, Mercurial assigns the branch name "default". So the name of the default branch in a repository is "default" (which, for example, is not displayed when doing a {{{hg log}}}). |
| Line 60: | Line 93: |
| Some Mercurial users do not use branch names at all. And there is indeed no need to assign branch names in Mercurial. Some users find them helpful, some not. Establish and apply your local consensus. === See also === * MultipleHeads * NamedBranches * LocalBranches * LocalbranchExtension * BranchPlan |
|
| Line 61: | Line 103: |
| CategoryCommand | CategoryCommand CategoryGlossary |
Branch
hg branch
hg branches
The term branch is sometimes used for slightly different concepts. This may be confusing for new users of Mercurial.
Strictly speaking, a branch is created when a user creates a new [:ChangeSet:changeset] C2 in a [:Repository:repository] R0, if its [:Parent:parent] changeset P already has a child C1, thus adding a second child changeset C2 to that parent P. This adds a new [:Head:head] to R0.
The creation of a branch can also happen in two different repositories R1 and R2, both containing the same parent changeset P, and a user [:Commit:committing] a new changeset C1 in R1 using P as its parent and a second user (or the same user) committing another new changeset C2 in R2 using the same changeset P as parent. From that perspective, each of these repositories may be seen as a "branch" of the other (see also ["Clone"]).
Note: after doing a hg --repository R1 pull --rev 3b978afa9ee5 R2, repository R1 will look the same as repository R0 (see ["Pull"]). This finally adds a new head to R1 as well.
As such, each changeset in Mercurial forms an element of a branch. A changeset thus can be said to "belong to a branch". Per that definition, a branch is simply a linear sequence of changesets.
Mercurial supports giving names to branches, by using the branch name property of the changeset (see NamedBranches). If no branch name is specified when committing a new changeset, Mercurial assigns the branch name "default". So the name of the default branch in a repository is "default" (which, for example, is not displayed when doing a hg log).
The command hg branches lists all branch names existing in a repository:
> hg help branches
hg branches [-a]
list repository named branches
List the repository's named branches, indicating which ones are
inactive. If active is specified, only show active branches.
A branch is considered active if it contains unmerged heads.
options:
-a --active show only branches that have unmerged heads
use "hg -v help branches" to show global optionsThe command hg branch may be used to specify a branch name for the next commit:
> hg help branch
hg branch [-f] [NAME]
set or show the current branch name
With no argument, show the current branch name. With one argument,
set the working directory branch name (the branch does not exist in
the repository until the next commit).
Unless --force is specified, branch will not let you set a
branch name that shadows an existing branch.
options:
-f --force set branch name even if it shadows an existing branch
use "hg -v help branch" to show global optionsMercurial branch names may be used for whatever reasons users want. However, a good rule of thumb is to use branch names sparingly and for rather longer lived concepts like "release branches" (rel-1, rel-2, etc) and rather not for short lived work of single developers.
Some Mercurial users do not use branch names at all. And there is indeed no need to assign branch names in Mercurial. Some users find them helpful, some not. Establish and apply your local consensus.