Integrated: 1320: Skara failing to create backport records for fixes synced into mainline

[Erik Joelsson]

On Wed, 19 Jan 2022 17:17:45 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

> When forward merging changes from jdk18 to mainline, we are no longer correctly creating backport entries for jdk19. This is because we switched from a Skara configuration for fixVersion to using the .jcheck/conf version from the repo in mainline. When Skara figures out the correct fixVersion from .jcheck/conf, it uses the file at the commit in question. In the case of a forward merge, that commit will have an outdated version in .jcheck/conf, as the commit is not a descendant of the version update change.
> 
> This change fixes this situation, by optionally (through a configuration parameter) have Skara use the HEAD version of .jcheck/conf (for the given branch) when resolving fixVersion for a commit. Some care needs to be taken when using this option, but essentially no more so than we already had to do when configuring the fixVersion in the Skara config.
> 
> The plan is to enable this option just for mainline jdk and jfx.

This pull request has now been integrated.

Changeset: 556c63d5
Author:    Erik Joelsson <erikj at openjdk.org>
URL:       https://git.openjdk.java.net/skara/commit/556c63d5a0f18cb7dea1ab8a46f41a0e1551a469
Stats:     82 lines in 4 files changed: 79 ins; 0 del; 3 mod

1320: Skara failing to create backport records for fixes synced into mainline

Reviewed-by: kcr

-------------

PR: https://git.openjdk.java.net/skara/pull/1276