Mutable Branches

Author: Gideon Sireling

Repository: http://code.accursoft.com/mutable-branches/

Issue tracker: http://code.accursoft.com/mutable-branches/issues

1. Overview

The mutable-branches extension allows named branches to be renamed, without rewriting history. This is achieved by separating a branch's identity from its name.

2. Renaming Branches

To start renaming branches, create a file called .hgbranches in the root of the working directory, and check it in. Each line in .hgbranches consists of a space-delimited pair such as oldBranch newBranch. If the branch name contains spaces, it should be quoted.

There are no changes to Mercurial's UI, other than not scolding the user when they create a new branch.

3. Conflicts

If conflicting changes have been made to .hgbranches on different branches, or if it contains conflicting entries, this will be resolved by the same rules that apply to .hgtags.

4. Local Branches

If the user creates a local branch which they do not intend pushing, it can be recorded in .hg/localbranches.

5. Backwards Compatibility

If a branch ID is not recorded in .hgbranches or .hg/localbranches, the ID will be used as the branch name. Thus, existing branches can be used (and renamed) without any modifications. If the branch is renamed, older clients will continue to use the old name.

6. Forwards Compatibility

Future development could add other fields to .hgbranches, such as description or owner.


CategoryExtensionsByOthers