engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge-logic: improve merge failed because of conflicts message.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-01-19 14:04:19 +01:00
parent a044290ee2
commit 57268f2564
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/model/pull_request.py
View file

@ -80,7 +80,7 @@ class PullRequestModel(BaseModel):
'This pull request cannot be merged because of an unhandled'
' exception.'),
MergeFailureReason.MERGE_FAILED: lazy_ugettext(
'This pull request cannot be merged because of conflicts.'),
'This pull request cannot be merged because of merge conflicts.'),
MergeFailureReason.PUSH_FAILED: lazy_ugettext(
'This pull request could not be merged because push to target'
' failed.'),

4
rhodecode/tests/models/test_pullrequest.py
View file

@ -183,7 +183,7 @@ class TestPullRequestModel:
assert status is False
assert (
msg.eval() ==
'This pull request cannot be merged because of conflicts.')
'This pull request cannot be merged because of merge conflicts.')
self.merge_mock.assert_called_once_with(
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
@ -200,7 +200,7 @@ class TestPullRequestModel:
assert status is False
assert (
msg.eval() ==
'This pull request cannot be merged because of conflicts.')
'This pull request cannot be merged because of merge conflicts.')
assert self.merge_mock.called is False
def test_merge_status_unknown_failure(self, pull_request):