diff options
Diffstat (limited to 'subcmds')
| -rw-r--r-- | subcmds/start.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/subcmds/start.py b/subcmds/start.py index 290b6897..c3ec303e 100644 --- a/subcmds/start.py +++ b/subcmds/start.py | |||
| @@ -18,7 +18,7 @@ import os | |||
| 18 | import sys | 18 | import sys |
| 19 | 19 | ||
| 20 | from command import Command | 20 | from command import Command |
| 21 | from git_config import IsId | 21 | from git_config import IsImmutable |
| 22 | from git_command import git | 22 | from git_command import git |
| 23 | import gitc_utils | 23 | import gitc_utils |
| 24 | from progress import Progress | 24 | from progress import Progress |
| @@ -96,11 +96,11 @@ revision specified in the manifest. | |||
| 96 | project.Sync_LocalHalf(sync_buf) | 96 | project.Sync_LocalHalf(sync_buf) |
| 97 | project.revisionId = gitc_project.old_revision | 97 | project.revisionId = gitc_project.old_revision |
| 98 | 98 | ||
| 99 | # If the current revision is a specific SHA1 then we can't push back | 99 | # If the current revision is immutable, such as a SHA1, a tag or |
| 100 | # to it; so substitute with dest_branch if defined, or with manifest | 100 | # a change, then we can't push back to it. Substitute with |
| 101 | # default revision instead. | 101 | # dest_branch, if defined; or with manifest default revision instead. |
| 102 | branch_merge = '' | 102 | branch_merge = '' |
| 103 | if IsId(project.revisionExpr): | 103 | if IsImmutable(project.revisionExpr): |
| 104 | if project.dest_branch: | 104 | if project.dest_branch: |
| 105 | branch_merge = project.dest_branch | 105 | branch_merge = project.dest_branch |
| 106 | else: | 106 | else: |
