Mercurial > hg
comparison mercurial/localrepo.py @ 20245:4edd179fefb8
help: branch names primarily denote the tipmost unclosed branch head
Was the behavior correct and the description wrong so it should be updated as
in this patch? Or should the code work as the documentation says?
Both ways could make some sense ... but none of them are obvious in all cases.
One place where it currently cause problems is when the current revision has
another branch head that is closer to tip but closed. 'hg rebase' refuses to
rebase to that as it only see the tip-most unclosed branch head which is the
current revision.
/me kind of likes named branches, but no so much how branch closing works ...
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 21 Nov 2013 15:17:18 -0500 |
parents | 76d9364119fc |
children | 654dd8284ead |
comparison
equal
deleted
inserted
replaced
20244:47d0843647d1 | 20245:4edd179fefb8 |
---|---|
653 if n == node: | 653 if n == node: |
654 marks.append(bookmark) | 654 marks.append(bookmark) |
655 return sorted(marks) | 655 return sorted(marks) |
656 | 656 |
657 def branchmap(self): | 657 def branchmap(self): |
658 '''returns a dictionary {branch: [branchheads]}''' | 658 '''returns a dictionary {branch: [branchheads]} with branchheads |
659 ordered by increasing revision number''' | |
659 branchmap.updatecache(self) | 660 branchmap.updatecache(self) |
660 return self._branchcaches[self.filtername] | 661 return self._branchcaches[self.filtername] |
661 | 662 |
662 def branchtip(self, branch): | 663 def branchtip(self, branch): |
663 '''return the tip node for a given branch''' | 664 '''return the tip node for a given branch''' |