diff options
Diffstat (limited to 'project.py')
| -rwxr-xr-x | project.py | 8 |
1 files changed, 6 insertions, 2 deletions
| @@ -1697,7 +1697,7 @@ class Project(object): | |||
| 1697 | 1697 | ||
| 1698 | # Branch Management ## | 1698 | # Branch Management ## |
| 1699 | 1699 | ||
| 1700 | def StartBranch(self, name, branch_merge=''): | 1700 | def StartBranch(self, name, branch_merge='', revision=None): |
| 1701 | """Create a new branch off the manifest's revision. | 1701 | """Create a new branch off the manifest's revision. |
| 1702 | """ | 1702 | """ |
| 1703 | if not branch_merge: | 1703 | if not branch_merge: |
| @@ -1718,7 +1718,11 @@ class Project(object): | |||
| 1718 | branch.merge = branch_merge | 1718 | branch.merge = branch_merge |
| 1719 | if not branch.merge.startswith('refs/') and not ID_RE.match(branch_merge): | 1719 | if not branch.merge.startswith('refs/') and not ID_RE.match(branch_merge): |
| 1720 | branch.merge = R_HEADS + branch_merge | 1720 | branch.merge = R_HEADS + branch_merge |
| 1721 | revid = self.GetRevisionId(all_refs) | 1721 | |
| 1722 | if revision is None: | ||
| 1723 | revid = self.GetRevisionId(all_refs) | ||
| 1724 | else: | ||
| 1725 | revid = self.work_git.rev_parse(revision) | ||
| 1722 | 1726 | ||
| 1723 | if head.startswith(R_HEADS): | 1727 | if head.startswith(R_HEADS): |
| 1724 | try: | 1728 | try: |
