Show More
@@ -649,7 +649,7 b' class MercurialRepository(BaseRepository' | |||||
649 | # The rebase-abort may raise another exception which 'hides' |
|
649 | # The rebase-abort may raise another exception which 'hides' | |
650 | # the original one, therefore we log it here. |
|
650 | # the original one, therefore we log it here. | |
651 | log.exception('Error while rebasing shadow repo during merge.') |
|
651 | log.exception('Error while rebasing shadow repo during merge.') | |
652 |
if 'unresolved conflicts' in e |
|
652 | if 'unresolved conflicts' in safe_str(e): | |
653 | unresolved = self._remote.get_unresolved_files() |
|
653 | unresolved = self._remote.get_unresolved_files() | |
654 | log.debug('unresolved files: %s', unresolved) |
|
654 | log.debug('unresolved files: %s', unresolved) | |
655 |
|
655 | |||
@@ -675,7 +675,7 b' class MercurialRepository(BaseRepository' | |||||
675 | # The merge-abort may raise another exception which 'hides' |
|
675 | # The merge-abort may raise another exception which 'hides' | |
676 | # the original one, therefore we log it here. |
|
676 | # the original one, therefore we log it here. | |
677 | log.exception('Error while merging shadow repo during merge.') |
|
677 | log.exception('Error while merging shadow repo during merge.') | |
678 |
if 'unresolved merge conflicts' in e |
|
678 | if 'unresolved merge conflicts' in safe_str(e): | |
679 | unresolved = self._remote.get_unresolved_files() |
|
679 | unresolved = self._remote.get_unresolved_files() | |
680 | log.debug('unresolved files: %s', unresolved) |
|
680 | log.debug('unresolved files: %s', unresolved) | |
681 |
|
681 |
General Comments 0
You need to be logged in to leave comments.
Login now