Provide an example workflow with Mercurial branches. #mercurial #hg #scm

hg-branch-example-hgrc

#
# Example configuration for .hgrc
#

[extensions]
extdiff=
graphlog=

hg-branch-example.sh

# Create a new branch and immediately switch to it
hg branch feature-a

# work inside "feature-a" and commit your work
hg commit 

# Switch to our default branch (updating also our working copy)
hg update default

# work inside "default" and commit
hg commit

# Switch back to "feature-a"
hg update "feature-a"

# work a little more
hg commit

# Switch to default branch
hg update default

# Preview diffs
hg diff -r default:feature-a              # textual
hg extdiff -p meld -r default:feature-a   # visual

# Merge with feature-a
hg merge -t meld "feature-a"
hg commit