# switch to the named branch
$ hg update -C my_branch

# write some code and commit the changes
$ hg commit

# switch to default
$ hg update -C default

# merge the revised code from the branch
$ hg merge -r my_branch

# view the updated stuff
$ hg st
M app/controllers/blergs_controller.rb
M app/models/blerg.rb