Show More
@@ -409,7 +409,9 b' class BaseRepository(object):' | |||||
409 | shadow_repository_path, target_ref, source_repo, |
|
409 | shadow_repository_path, target_ref, source_repo, | |
410 | source_ref, message, user_name, user_email, dry_run=dry_run) |
|
410 | source_ref, message, user_name, user_email, dry_run=dry_run) | |
411 | except RepositoryError: |
|
411 | except RepositoryError: | |
412 | log.exception('Unexpected failure when running merge') |
|
412 | log.exception( | |
|
413 | 'Unexpected failure when running merge, dry-run=%s', | |||
|
414 | dry_run) | |||
413 | return MergeResponse( |
|
415 | return MergeResponse( | |
414 | False, False, None, MergeFailureReason.UNKNOWN) |
|
416 | False, False, None, MergeFailureReason.UNKNOWN) | |
415 |
|
417 |
General Comments 0
You need to be logged in to leave comments.
Login now