From 20737b6ecbe9d8a09e986ab46bee28202e4212df Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 29 Jan 2020 13:38:59 +0100 Subject: [PATCH] CreateMergePatchSet: Improve message which is returned if there are conflicts Signed-off-by: Edwin Kempin Change-Id: If0925d9be97f32949b7a5d0a855d09f8275c904e --- java/com/google/gerrit/server/git/MergeUtil.java | 2 +- javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index 801300ed7a..18394b5b0e 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -462,7 +462,7 @@ public class MergeUtil { } public static String createConflictMessage(List conflicts) { - StringBuilder sb = new StringBuilder("merge conflict(s)"); + StringBuilder sb = new StringBuilder("merge conflict(s):"); for (String c : conflicts) { sb.append('\n').append(c); } diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index a62f225bec..5838328484 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -3248,7 +3248,7 @@ public class ChangeIT extends AbstractDaemonTest { assertThrows( ResourceConflictException.class, () -> gApi.changes().id(changeId).createMergePatchSet(in)); - assertThat(thrown).hasMessageThat().isEqualTo("merge conflict(s)\n" + fileName); + assertThat(thrown).hasMessageThat().isEqualTo("merge conflict(s):\n" + fileName); } @Test