diff options
-rw-r--r-- | project.py | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -706,10 +706,9 @@ class Project(object): | |||
706 | # commits are not yet merged upstream. We do not want | 706 | # commits are not yet merged upstream. We do not want |
707 | # to rewrite the published commits so we punt. | 707 | # to rewrite the published commits so we punt. |
708 | # | 708 | # |
709 | syncbuf.info(self, | 709 | syncbuf.fail(self, |
710 | "branch %s is published but is now %d commits behind", | 710 | "branch %s is published (but not merged) and is now %d commits behind" |
711 | branch.name, | 711 | % (branch.name, len(upstream_gain))) |
712 | len(upstream_gain)) | ||
713 | return | 712 | return |
714 | elif pub == head: | 713 | elif pub == head: |
715 | # All published commits are merged, and thus we are a | 714 | # All published commits are merged, and thus we are a |