Versions Compared

Old Version 5

changes.mady.by.user Jesper Wilhelmsson

Saved on

compared with

New Version 6

changes.mady.by.user Jesper Wilhelmsson

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Expand
titleHow to know when a change will be integrated

Include Page
Integration and Integration Blockers
Integration and Integration Blockers

Expand
titleHow to integrate changes between jdk/hs and jdk/jdk
Include Page
Integration from jdk/jdk to jdk/hsIntegration from jdk/jdk to jdk/hs
Expand
titleHow to fix an incorrect backport creation

If a main bug is targeted to a release and the fix is pushed to a different release, then a backport bug is automatically created. Usually this is a "good thing", e.g., when you are really backporting a fix to an earlier release, but not always... If the main bug is targeted to a later release (due to schedule planning), but someone finds the time to fix that bug in the current release, then the bug should be retargeted to the current release before pushing the fix. However, sometimes we forget to do that.

Here is how to fix that:

Info

In this example a fix was pushed to JDK 10 (a.k.a. the current release) while the JBS bug was targeted to JDK 11 (a.k.a. a future release).

 

  1. Reopen the backport bug that was created automatically

    • Use a comment like the following (in the reopen dialog):

      Panel
      Fix was pushed while main bug was targeted to '11'. Reset the main bug to fixed in '10', reset this bug to fix in '11' and closed as 'Not An Issue' since JDK 11 will automatically get this fix from JDK 10.
    • Change the 'Fix Version/s' from '10' to '11'.
    • Close the backport bug as "Not an Issue".
  2. Clean up the main bug

    • Copy the open push notification comment from the backport bug to the main bug, e.g.:

      Panel
      HG Updates added a comment - 6 hours ago
      URL: http://hg.openjdk.java.net/jdk/jdk/rev/8db54e2c453b
      User: clanger
      Date: 2017-12-11 07:25:20 +0000

    • Add a comment like the following to the main bug:

      Panel
      Fix was pushed while main bug was targeted to '11'. Reset the main bug to fixed in '10' and copied the hgupdater entry here.
    • Reset the main bug 'Fix Version/s' from '11' to '10'.
    • Resolve the main bug as "Fixed" in build "team" or in build "master" depending on where the fix was pushed. Pushes to 'jdk/jdk' are fixed in build "master" and pushes to other repos are fixed in build "team".

...