Diff for "NamedBranches"

Differences between revisions 2 and 27 (spanning 25 versions)

39 year-old Santa Clarita-born and raised Blake Stephens is addicted to Alicante Spain weather, gadgets, rocking aids babies. And lastly she is captivated by playing with her great friends.

-  ⇤ ← Revision 2 as of 2006-12-19 21:16:43 → 
  Size: 1961
  Editor: mpm
  Comment:
+   ← Revision 27 as of 2013-08-26 09:44:25 → ⇥
  Size: 301
  Editor: LoreanDaniels666
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-Named branches allow assigning persistent symbolic names to branches of development inside a single repository.

To begin a branch, mark your current working directory and then commit it:
{{{
$ hg branch
$ hg branch newfeature
$ hg branch
newfeature
$ hg ci -m "start feature branch"
$ hg parents
changeset:   3899:c08bfc770d37
branch:      newfeature
tag:         tip
user:        Matt Mackall <mpm@selenic.com>
date:        Tue Dec 19 14:20:11 2006 -0600
summary:     start feature branch
}}}

From this moment on, all commits will get tagged with the supplied branch name. When merging with another branch, the local branch name takes precedence:

{{{
$ hg branch
newfeature
$ hg in remote
searching for changes
changeset:   3900:3be94ff00829
branch:      main
tag:         tip
parent:      3898:93e5f07baf75
user:        Matt Mackall <mpm@selenic.com>
date:        Tue Dec 19 14:26:52 2006 -0600
summary:     bug fix

$ hg pull remote
pulling from remote
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg branch
newfeature
}}}

Branch names can be used anywhere that tag names can, including log, diff, push, and pull. When a branch has multiple heads, the tipmost revision of the branch will be found. Here are some examples:

{{{
$ hg branches
main                           3900:3be94ff00829
newfeature                     3899:c08bfc770d37
$ hg log -r main
changeset:   3900:3be94ff00829
branch:      main
tag:         tip
parent:      3898:93e5f07baf75
user:        Matt Mackall <mpm@selenic.com>
date:        Tue Dec 19 14:26:52 2006 -0600
summary:     bug fix
$ hg in -r main ../bd2
searching for changes
no changes found
}}}
+year-old Santa Clarita-born and raised Blake Stephens is addicted to [[http://awesomeindiefilms.doobious.org/groups/travelling-soon-take-these-sound-advice-with-you-1197152397/|Alicante Spain weather,]] gadgets, rocking aids babies. And lastly she is captivated by playing with her great friends.