From 1b4ce0b7a5b58bf1369f37f7435a0c4cc97ffac3 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@rhodecode.com>
Date: Wed, 8 Jun 2016 23:57:08 +0200
Subject: [PATCH] hg: Include state of dry_run in merge failure logging.

---
 rhodecode/lib/vcs/backends/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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