|
Size: 1158
Comment: update to branch tip done some time ago
|
Size: 1163
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 15: | Line 15: |
| * if a branch is set, update should update to the tip of the current branch (./) * merging a branch that's descended from the current branch should ''fast-forward'' (./) |
|
| Line 19: | Line 21: |
| * if a branch is set, update should update to the tip of the current branch (./) | |
| Line 21: | Line 22: |
| * merging a branch that's descended from the current branch should ''fast-forward'' |
extend changelog format to allow storing new attributes
add a .hg/branch file to indicate the branch name in the working directory
read the .hg/branch file on commit
update the .hg/branch file on checkout
- leave it alone on merge (we stay on the current branch)
add a branchtags() function to localrepo with a cache
teach lookup about branch names
teach log and friends about branch names
teach hg id about branch names
get hg pull -r <branch> working
add a command to show all existing branches
add a command to change the current branch
deprecate old -b options
teach hgweb about branch names
if a branch is set, update should update to the tip of the current branch
merging a branch that's descended from the current branch should fast-forward
Need more smarts for the following commands:
heads <branch> should show all heads of that branch
- updating to a revision on a different branch should require a merge
- log should have an option to show the history of a single branch, stopping at its fork point