# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-10-03 09:20:25
# Node ID 495fb7a8e4e1f5698d1638b0a18c08ba2c6a4e0b
# Parent  d3bcf7c23294f917a47f40c847217a9d1d222785

vcs: merge logic with dry run now uses better default arguments.
Helps to find out where the merge came from.

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
@@ -393,9 +393,9 @@ class BaseRepository(object):
             on top of the target instead of being merged.
         """
         if dry_run:
-            message = message or 'sample_message'
-            user_email = user_email or 'user@email.com'
-            user_name = user_name or 'user name'
+            message = message or 'dry_run_merge_message'
+            user_email = user_email or 'dry-run-merge@rhodecode.com'
+            user_name = user_name or 'Dry-Run User'
         else:
             if not user_name:
                 raise ValueError('user_name cannot be empty')