diff --git a/bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java b/bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java index d4eb22955..4e1b76c7f 100644 --- a/bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java +++ b/bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java @@ -184,6 +184,9 @@ private Set sentItemIds(List sentEmails) { private String parentAuthorPath(ArchiveItem item) { var ret = new StringBuilder(); ret.append(item.author().id()); + ret.append(":"); + ret.append(item.subject()); + ret.append(":"); while (item.parent().isPresent()) { item = item.parent().get(); ret.append("."); diff --git a/bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java b/bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java index 8321918ef..c310c0b53 100644 --- a/bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java +++ b/bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java @@ -323,6 +323,9 @@ void archiveIntegrated(TestInfo testInfo) throws IOException { Repository.materialize(archiveFolder.path(), archive.url(), "master"); assertTrue(archiveContains(archiveFolder.path(), "Subject: RFR: 1234: This is a pull request")); + // Add a comment quickly before integration - it should not be combined with the integration message + pr.addComment("I will now integrate this PR"); + // Now it has been integrated var ignoredPr = ignored.pullRequest(pr.id()); ignoredPr.setBody("This has been integrated"); @@ -335,6 +338,7 @@ void archiveIntegrated(TestInfo testInfo) throws IOException { // The archive should now contain another entry Repository.materialize(archiveFolder.path(), archive.url(), "master"); + assertTrue(archiveContains(archiveFolder.path(), "Subject: Re: RFR: 1234: This is a pull request")); assertTrue(archiveContains(archiveFolder.path(), "Subject: Integrated: 1234: This is a pull request")); assertFalse(archiveContains(archiveFolder.path(), "\\[Closed\\]")); }