mirror of
https://gerrit.googlesource.com/git-repo
synced 2025-06-28 20:17:26 +00:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
23d7781c0b | |||
a54c527ae9 |
13
project.py
13
project.py
@ -563,6 +563,19 @@ class Project(object):
|
||||
_info("[%s] Consider merging or rebasing the"
|
||||
" unpublished commits.", self.name)
|
||||
return True
|
||||
elif upstream_gain:
|
||||
# We can fast-forward safely.
|
||||
#
|
||||
try:
|
||||
self._FastForward(rev)
|
||||
except GitError:
|
||||
return False
|
||||
self._CopyFiles()
|
||||
return True
|
||||
else:
|
||||
# Trivially no changes in the upstream.
|
||||
#
|
||||
return True
|
||||
|
||||
if merge == rev:
|
||||
try:
|
||||
|
Reference in New Issue
Block a user