Show More
@@ -716,7 +716,8 b' class MercurialRepository(BaseRepository' | |||||
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 |
|
719 | 'Failure when doing local from the shadow repository ' | |
|
720 | 'to the target repository.') | |||
720 | merge_succeeded = False |
|
721 | merge_succeeded = False | |
721 | merge_failure_reason = MergeFailureReason.PUSH_FAILED |
|
722 | merge_failure_reason = MergeFailureReason.PUSH_FAILED | |
722 | else: |
|
723 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now