Differences between revisions 4 and 6 (spanning 2 versions)
Revision 4 as of 2006-10-24 22:14:35
Size: 878
Editor: mpm
Comment:
Revision 6 as of 2006-12-20 22:21:54
Size: 1153
Editor: BrendanCully
Comment: Added log branch support
Deletions are marked like this. Additions are marked like this.
Line 15: 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)
Need more smarts for the following commands:

 * heads <branch> should show all heads of that branch
 * if a branch is set, update should update to the tip of the current branch
 * updating to a revision on a different branch should require a merge
 * merging a branch that's descended from the current branch should ''fast-forward''
 * log should have an option to show the history of a single branch, stopping at its fork point
  • 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 {*}

Need more smarts for the following commands:

  • heads <branch> should show all heads of that branch

  • if a branch is set, update should update to the tip of the current branch
  • updating to a revision on a different branch should require a merge
  • merging a branch that's descended from the current branch should fast-forward

  • log should have an option to show the history of a single branch, stopping at its fork point

BranchPlan (last edited 2012-10-25 21:06:18 by mpm)