Show More
@@ -714,7 +714,7 b' class MercurialRepository(BaseRepository' | |||||
714 | merge_commit_id, self.path, push_branches=True, |
|
714 | merge_commit_id, self.path, push_branches=True, | |
715 | enable_hooks=True) |
|
715 | enable_hooks=True) | |
716 | merge_succeeded = True |
|
716 | merge_succeeded = True | |
717 |
except RepositoryError |
|
717 | except RepositoryError: | |
718 | log.exception( |
|
718 | log.exception( | |
719 | 'Failure when doing local push on hg shadow repo') |
|
719 | 'Failure when doing local push on hg shadow repo') | |
720 | merge_succeeded = False |
|
720 | merge_succeeded = False |
General Comments 0
You need to be logged in to leave comments.
Login now