Tools/git-repo
1
0
Fork 0
Code Activity

Fix 'repo sync' rebase logic on a published branch

Browse source 
If the current branch is published, but all published commits are
merged into the manifest revision, but there is also at least one
unpublished commit on the current branch, we should rebase the
unpublished commit, rather than creating a merge commit.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2009-04-21 08:26:32 -07:00
parent eb7af87bcf
commit 05f66b6836
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
project.py
View file

@ -682,18 +682,15 @@ class Project(object):
branch.name, branch.name,
len(upstream_gain)) len(upstream_gain))
return return
elif upstream_gain: elif pub == head:
# We can fast-forward safely. # All published commits are merged, and thus we are a
# strict subset. We can fast-forward safely.
# #
def _doff(): def _doff():
self._FastForward(rev) self._FastForward(rev)
self._CopyFiles() self._CopyFiles()
syncbuf.later1(self, _doff) syncbuf.later1(self, _doff)
return return
else:
# Trivially no changes in the upstream.
#
return
if merge == rev: if merge == rev:
try: try: