|
Size: 1678
Comment:
|
Size: 1595
Comment: updated style
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 5: | Line 5: |
| ''Author: Gideon Sireling | '''This extension is not distributed with Mercurial.''' ''Author: Gideon Sireling'' |
| Line 9: | Line 11: |
| Issue tracker: http://code.accursoft.com/mutable-branches/issues'' | Issue tracker: http://code.accursoft.com/mutable-branches/issues |
| Line 15: | Line 17: |
| The mutable-branches extension allows [[NamedBranches|named branches]] to be renamed, without rewriting history. This is achieved by separating a branch's identity from its name. | The mutable-branches extension allows [[NamedBranches|named branches]] to be renamed, without rewriting history. Renamings are tracked by a file in the working directory. == Installation == Clone the repository to your local hard drive, or simply download [[http://code.accursoft.com/mutable-branches/raw/tip/mutable-branches.py|mutable-branches.py]]. Then add the following to your ''`mercurial.ini`'' or ''`.hgrc`'': {{{ [extensions] mutable-branches = path/to/mutable-branches.py }}} |
| Line 23: | Line 34: |
| == 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`. |
|
| Line 29: | Line 36: |
| If the user creates a local branch which they do not intend pushing, it can be recorded in `.hg/localbranches`. | If the user creates a local branch which they do not intend pushing, it can be recorded in `.hg/localbranches`. Local renamings override repository renamings. |
| Line 31: | Line 38: |
| == Backwards Compatibility == | == Future Development == |
| Line 33: | Line 40: |
| 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. == Forwards Compatibility == Future development could add other fields to `.hgbranches`, such as description or owner. |
Other fields could be added to `.hgbranches`, such as the branch's description or owner. |
Mutable Branches
This extension is not distributed with Mercurial.
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. Renamings are tracked by a file in the working directory.
2. Installation
Clone the repository to your local hard drive, or simply download mutable-branches.py. Then add the following to your mercurial.ini or .hgrc:
[extensions] mutable-branches = path/to/mutable-branches.py
3. 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.
4. Local Branches
If the user creates a local branch which they do not intend pushing, it can be recorded in .hg/localbranches. Local renamings override repository renamings.
5. Future Development
Other fields could be added to .hgbranches, such as the branch's description or owner.