From 0a39f5bf0010da49494c8ef54a3a336c7d8618a8 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 3 Oct 2016 11:20:25 +0200 Subject: [PATCH] vcs: merge logic with dry run now uses better default arguments. Helps to find out where the merge came from. --- rhodecode/lib/vcs/backends/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py index c26ad7fe..ff8dcddf 100644 --- 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')