summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--project.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/project.py b/project.py
index 120264f7..b8a347d9 100644
--- a/project.py
+++ b/project.py
@@ -563,6 +563,15 @@ class Project(object):
563 _info("[%s] Consider merging or rebasing the" 563 _info("[%s] Consider merging or rebasing the"
564 " unpublished commits.", self.name) 564 " unpublished commits.", self.name)
565 return True 565 return True
566 else:
567 # We can fast-forward safely.
568 #
569 try:
570 self._FastForward(rev)
571 except GitError:
572 return False
573 self._CopyFiles()
574 return True
566 575
567 if merge == rev: 576 if merge == rev:
568 try: 577 try: