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

Kevin Rushforth kcr at openjdk.java.net
Wed Jan 19 17:36:48 UTC 2022

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.

Looks good.


Marked as reviewed by kcr (Reviewer).

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

More information about the skara-dev mailing list