klenwell information services : MercurialBranches

Revision history for MercurialBranches


Revision [3051]

Last edited on 2016-07-09 16:54:44 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
[[http://stackoverflow.com/questions/50223/how-to-repeatedly-merge-branches-in-mercurial/50475#50475 | Merge Branches in Mercurial]] (stackoverflow.com)
[[http://mercurial.selenic.com/wiki/NamedBranches | Named Branches]] (mercurial.selenic.com)
Deletions:
[[http://stackoverflow.com/questions/50223/how-to-repeatedly-merge-branches-in-mercurial/50475#50475 Merge Branches in Mercurial]] (stackoverflow.com)
[[http://mercurial.selenic.com/wiki/NamedBranches Named Branches]] (mercurial.selenic.com)


Revision [2377]

Edited on 2013-01-03 11:54:02 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
====Closing Branches====
ref: http://stackoverflow.com/a/3228023/1093087
$ hg update new-branch
$ hg commit -m "closing new-branch" --close-branch


Revision [1729]

Edited on 2010-11-19 15:49:01 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
marked working directory as branch new-branch


Revision [1728]

Edited on 2010-11-19 15:48:35 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
# Confirm New Branch
# Confirm Switch
Deletions:
# Switch to New Branch
$ hg update -C new-branches


Revision [1727]

Edited on 2010-11-19 15:40:36 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
$ hg branch new-branch
$ hg update -C new-branches
Deletions:
hg branch new-branch
hg update -C new-branches
hg update -C default


Revision [1726]

Edited on 2010-11-19 15:40:07 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
Simple Example: Create a new branch, switch to it, and switch back to default
Simple Example: merge new-branch back into default
Deletions:
===Simple Example: Create a new branch, switch to it, and switch back to default===
===Simple Example: merge new-branch back into default===
Note: ""<tt>hg update -C <branch_name></tt>"" switches to the given branch.


Revision [1725]

Edited on 2010-11-19 15:39:41 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
====Create a New Branch====
===Simple Example: Create a new branch, switch to it, and switch back to default===
# Check Current Branch
# Create New Branch
hg branch new-branch
# Switch to New Branch
hg update -C new-branches
# List Branches (Several Weeks Later)
# Switch Back to Default
hg update -C default


Revision [1695]

Edited on 2010-11-08 09:45:52 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
$ hg merge new-branch
[[http://stackoverflow.com/questions/50223/how-to-repeatedly-merge-branches-in-mercurial/50475#50475 Merge Branches in Mercurial]] (stackoverflow.com)


Revision [1625]

Edited on 2010-10-08 17:42:58 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
**Note**: it is always advisable to copy your repository and test out these steps on the copy before proceeding.


Revision [1624]

Edited on 2010-10-08 17:42:10 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
===Simple Example: merge new-branch back into default===
Note: ""<tt>hg update -C <branch_name></tt>"" switches to the given branch.
Deletions:
Simple Example: merge new-branch back into default


Revision [1623]

Edited on 2010-10-08 17:40:11 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]
Additions:
Simple Example: merge new-branch back into default
%%
$ hg branches
new-branch 200:ad96a97024ce
default 100:019016980509 (inactive)
$ hg branch
new-branch
$ hg update -C default
10 files updated, 0 files merged, 5 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m "merged new-branch back into default"
$ hg branch
default
%%
Usage
%%
$ hg merge --usage
hg merge: option --usage not recognized
hg merge [-f] [[-r] REV]
merge working directory with another revision
Merge the contents of the current working directory and the
requested revision. Files that changed between either parent are
marked as changed for the next commit and a commit must be
performed before any further updates are allowed.
If no revision is specified, the working directory's parent is a
head revision, and the repository contains exactly one other head,
the other head is merged with by default. Otherwise, an explicit
revision to merge with must be provided.
options:
-f --force force a merge with outstanding changes
-r --rev revision to merge
%%
Deletions:
ref: http://mercurial.selenic.com/wiki/NamedBranches


Revision [1622]

The oldest known version of this page was created on 2010-10-08 16:48:18 by KlenwellAdmin [Replaces old-style internal links with new pipe-split links.]