hg: Include state of dry_run in merge failure logging.

2016-06-08 23:57:08 +02:00 · 2016-06-08 23:57:08 +02:00 · 1b4ce0b7a5
commit 1b4ce0b7a5
parent f42158291f
1 changed files with 3 additions and 1 deletions
--- a/rhodecode/lib/vcs/backends/base.py
+++ b/rhodecode/lib/vcs/backends/base.py
@ -409,7 +409,9 @@ class BaseRepository(object):
                shadow_repository_path, target_ref, source_repo,
                source_ref, message, user_name, user_email, dry_run=dry_run)
        except RepositoryError:
-            log.exception('Unexpected failure when running merge')
+            log.exception(
+                'Unexpected failure when running merge, dry-run=%s',
+                dry_run)
            return MergeResponse(
                False, False, None, MergeFailureReason.UNKNOWN)