opendev/gerrit
Code Issues Proposed changes

CreateMergePatchSet: Improve message which is returned if there are conflicts

Browse Source 
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: If0925d9be97f32949b7a5d0a855d09f8275c904e
This commit is contained in:
Edwin Kempin
2020-01-29 13:38:59 +01:00
parent 0a4b40fa9a
commit 20737b6ecb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -462,7 +462,7 @@ public class MergeUtil {
} }
public static String createConflictMessage(List<String> conflicts) { public static String createConflictMessage(List<String> conflicts) {
StringBuilder sb = new StringBuilder("merge conflict(s)"); StringBuilder sb = new StringBuilder("merge conflict(s):");
for (String c : conflicts) { for (String c : conflicts) {
sb.append('\n').append(c); sb.append('\n').append(c);
} }

2
javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -3248,7 +3248,7 @@ public class ChangeIT extends AbstractDaemonTest {
assertThrows( assertThrows(
ResourceConflictException.class, ResourceConflictException.class,
() -> gApi.changes().id(changeId).createMergePatchSet(in)); () -> 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 @Test