vcs: merge logic with dry run now uses better default arguments.
Helps to find out where the merge came from.
This commit is contained in:
parent
721295056f
commit
0a39f5bf00
1 changed files with 3 additions and 3 deletions
|
|
@ -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')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue