##// END OF EJS Templates
mercurial: fix deprecation warnings on using exc.message attribute.
dan -
r4119:938f856a default
parent child Browse files
Show More
@@ -649,7 +649,7 b' class MercurialRepository(BaseRepository'
649 649 # The rebase-abort may raise another exception which 'hides'
650 650 # the original one, therefore we log it here.
651 651 log.exception('Error while rebasing shadow repo during merge.')
652 if 'unresolved conflicts' in e.message:
652 if 'unresolved conflicts' in safe_str(e):
653 653 unresolved = self._remote.get_unresolved_files()
654 654 log.debug('unresolved files: %s', unresolved)
655 655
@@ -675,7 +675,7 b' class MercurialRepository(BaseRepository'
675 675 # The merge-abort may raise another exception which 'hides'
676 676 # the original one, therefore we log it here.
677 677 log.exception('Error while merging shadow repo during merge.')
678 if 'unresolved merge conflicts' in e.message:
678 if 'unresolved merge conflicts' in safe_str(e):
679 679 unresolved = self._remote.get_unresolved_files()
680 680 log.debug('unresolved files: %s', unresolved)
681 681
General Comments 0
You need to be logged in to leave comments. Login now