Size: 2216
Comment:
|
Size: 525
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 1: | Line 1: |
Named branches allow assigning persistent symbolic names to branches of development inside a single repository. == create a branch == 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 }}} == commit changes to a 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 }}} == switch between branches == {{{ $ hg update -C main $ hg update -C newfeature }}} == links == * [http://hgbook.red-bean.com/hgbookch8.html Managing releases and branchy development] |
Wen is what people call me but my husband doesn't necessarily like it at all. What I really enjoy doing is simply horse riding and as a result I've been doing it for quite a short time. http://thumbs.dreamstime.com/thumbimg_499/1272602826cCDMii.jpg I used to be unemployed but now i'm a cashier. Minnesota is where I've always been living but now I'm considering other variations. My husband and Partner maintain a webpage. You might want to check it obtainable here: http://www.spacciohogan2013.it/hogan-olympia-uomo-c-2/ |
Wen is what people call me but my husband doesn't necessarily like it at all. What I really enjoy doing is simply horse riding and as a result I've been doing it for quite a short time. http://thumbs.dreamstime.com/thumbimg_499/1272602826cCDMii.jpg I used to be unemployed but now i'm a cashier. Minnesota is where I've always been living but now I'm considering other variations. My husband and Partner maintain a webpage. You might want to check it obtainable here: http://www.spacciohogan2013.it/hogan-olympia-uomo-c-2/