diff --git a/project.py b/project.py index b8a347d..ffbdfd1 100644 --- a/project.py +++ b/project.py @@ -563,7 +563,7 @@ class Project(object): _info("[%s] Consider merging or rebasing the" " unpublished commits.", self.name) return True - else: + elif upstream_gain: # We can fast-forward safely. # try: @@ -572,6 +572,10 @@ class Project(object): return False self._CopyFiles() return True + else: + # Trivially no changes in the upstream. + # + return True if merge == rev: try: