Add 'rebase="false"' attribute to the <project/> XML.
This new attribute can prevent 'repo sync' from automatically rebasing.
I hit a situation in where one of the git repositories I was tracking
was actually an external repository that I wanted to pull commits
into and merge myself. (NOT rebase, since that would lose the merge
history.) In this case, I'm not using 'repo upload', I'm manually
managing the merges to and from this repository.
Everything was going great until I typed 'repo sync' and it rebased
my manually-merged tree. Hence the option to skip it.
Change-Id: I965e0dd1acb87f4a56752ebedc7e2de1c502dbf8
diff --git a/project.py b/project.py
index f1a931c..60fa510 100644
--- a/project.py
+++ b/project.py
@@ -503,7 +503,8 @@
worktree,
relpath,
revisionExpr,
- revisionId):
+ revisionId,
+ rebase = True):
self.manifest = manifest
self.name = name
self.remote = remote
@@ -522,6 +523,8 @@
else:
self.revisionId = revisionId
+ self.rebase = rebase
+
self.snapshots = {}
self.copyfiles = []
self.config = GitConfig.ForRepository(
@@ -1096,7 +1099,7 @@
branch.merge = self.revisionExpr
branch.Save()
- if cnt_mine > 0:
+ if cnt_mine > 0 and self.rebase:
def _dorebase():
self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
self._CopyFiles()