|
⇤ ← Revision 1 as of 2006-10-18 00:20:33
Size: 713
Comment:
|
Size: 875
Comment: fast forward
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| Line 16: | Line 15: |
| * teach merge to do fast forward (one branch start point is the last cset of the other, so we don't have multiples heads and just need to update the branch name) |
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
- teach hgweb about branch names
- add a command to show all existing branches (tags -b?)
- add a command to change the current branch (tag -b?)
- deprecate old -b options
get hg pull -r <branch> working
- teach merge to do fast forward (one branch start point is the last cset of the other, so we don't have multiples heads and just need to update the branch name)