diff options
Diffstat (limited to 'meta/lib/patchtest/tests/test_mbox_merge.py')
| -rw-r--r-- | meta/lib/patchtest/tests/test_mbox_merge.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py index c8b6718d15..a7e0821e72 100644 --- a/meta/lib/patchtest/tests/test_mbox_merge.py +++ b/meta/lib/patchtest/tests/test_mbox_merge.py | |||
| @@ -20,6 +20,5 @@ class Merge(base.Base): | |||
| 20 | def test_series_merge_on_head(self): | 20 | def test_series_merge_on_head(self): |
| 21 | if not PatchTestInput.repo.ismerged: | 21 | if not PatchTestInput.repo.ismerged: |
| 22 | commithash, author, date, shortlog = headlog() | 22 | commithash, author, date, shortlog = headlog() |
| 23 | self.fail('Series does not apply on top of target branch', | 23 | self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct', |
| 24 | 'Rebase your series on top of targeted branch', | ||
| 25 | data=[('Targeted branch', '%s (currently at %s)' % (PatchTestInput.repo.branch, commithash))]) | 24 | data=[('Targeted branch', '%s (currently at %s)' % (PatchTestInput.repo.branch, commithash))]) |