Overview

Branching - a Mercurial Plugin

This is a Mercurial plugin that enables simpler branch management. Feature branch workflows that rely heavly on named branches will especially benefit from this extension.

Commands

harvest

$hg harvest BRANCH_NAME [TARGET_BRANCH]

Close the specified branch and merge it into the current branch, or the named target branch. If the merge fails, you will need to resolve and commit the merge manually.

close

$hg close BRANCH_NAME

Close the specified branch. This command does not affect your working directory.

switch

$hg switch BRANCH_NAME

Switch to the specified branch. This is essentially an alias of hg update -C.

branchdiff

$hg branchdiff BRANCH_NAME [TARGET_BRANCH]

Shows all the branch changes consolidated into a single diff. This allows you to preview the changes that will be merging or harvesting the branch.

cancel

$hg cancel

Cancel a (presumably failed) merge. This is an alias of hg update -C . but a bit easier to remember.