# HG changeset patch
# User Johannes Bornhold <johannes@rhodecode.com>
# Date 2016-06-08 21:57:08
# Node ID bffdfabf403b77507d59c173a02682ad7aeaa9c1
# Parent  b38e3c6292ddd55317ba059e6041d870611cf9d4

hg: Include state of dry_run in merge failure logging.

diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py
--- 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)