diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -503,7 +503,8 @@ class Project(object): | |||
503 | worktree, | 503 | worktree, |
504 | relpath, | 504 | relpath, |
505 | revisionExpr, | 505 | revisionExpr, |
506 | revisionId): | 506 | revisionId, |
507 | rebase = True): | ||
507 | self.manifest = manifest | 508 | self.manifest = manifest |
508 | self.name = name | 509 | self.name = name |
509 | self.remote = remote | 510 | self.remote = remote |
@@ -522,6 +523,8 @@ class Project(object): | |||
522 | else: | 523 | else: |
523 | self.revisionId = revisionId | 524 | self.revisionId = revisionId |
524 | 525 | ||
526 | self.rebase = rebase | ||
527 | |||
525 | self.snapshots = {} | 528 | self.snapshots = {} |
526 | self.copyfiles = [] | 529 | self.copyfiles = [] |
527 | self.config = GitConfig.ForRepository( | 530 | self.config = GitConfig.ForRepository( |
@@ -1096,7 +1099,7 @@ class Project(object): | |||
1096 | branch.merge = self.revisionExpr | 1099 | branch.merge = self.revisionExpr |
1097 | branch.Save() | 1100 | branch.Save() |
1098 | 1101 | ||
1099 | if cnt_mine > 0: | 1102 | if cnt_mine > 0 and self.rebase: |
1100 | def _dorebase(): | 1103 | def _dorebase(): |
1101 | self._Rebase(upstream = '%s^1' % last_mine, onto = revid) | 1104 | self._Rebase(upstream = '%s^1' % last_mine, onto = revid) |
1102 | self._CopyFiles() | 1105 | self._CopyFiles() |