• Home
    • View
    • Login
    This page
    • Normal
    • Export PDF
    • Page Information

    Loading...
  1. Dashboard
  2. Undefined Space
  3. Build
  4. Submission Forests

Page History

Versions Compared

Old Version 24

changes.mady.by.user Brian Beck

Saved on Oct 25, 2016

compared with

New Version 25

changes.mady.by.user Brian Beck

Saved on Oct 25, 2016

  • Previous Change: Difference between versions 23 and 24
  • Next Change: Difference between versions 25 and 26
  • View Page History

Key

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

...

You can commit the empty branches immediately after they're created or wait until you have made code changes.  Unlike the recommendation for the OpenJDK Sandbox forest, you should not commit an empty branch in a repository that will not eventually have code changes.  This will cause your fix to fail when it is merged with the upstream forest.  This restriction will be removed in the future.

How do I supply a commit message for my change?

The commit message for the changeset at the head of your branch is used as the commit message for the changeset that is integrated to the default branch of the upstream forest.

How should I push a branch?

The first time you push a new branch to the submission forest, you need to use the "--new-branch" option like this:

...

Changes from the upstream forest are pulled into the submission forest automatically.  You can keep your work on a fix branch in sync with what's going on upstream by simply merging in changes from the default branch.  This means however that you should not make changes to the default branch yourself.  Doing so would require merges to keep the default branch in sync with the upstream forest and would likely break the automation.

Is jcheck turned on?

Jcheck The jcheck Mercurial extension is not enabled for the submission forest; however, it generally is enabled for the upstream forest.  If so, your change must pass jcheck when it is merged with the upstream forest.

How

...

is

...

How is my branch merged with the upstream forest?

...

Once your branch has been integrated upstream, it will be closed automatically.  This is the common case.  Occasionally though, there may be a branch that needs to be abandoned.  This might happen when a branch has been pushed to the submission forest but  failed to integrate upstream.  

Can I reuse a branch for a different fix?

...

Overview
Content Tools
ThemeBuilder

Terms of Use
• License: GPLv2
• Privacy • Trademarks • Contact Us

Powered by a free Atlassian Confluence Open Source Project License granted to https://www.atlassian.com/software/views/opensource-community-additional-license-offer. Evaluate Confluence today.

  • Kolekti ThemeBuilder Powered by Atlassian Confluence 8.5.23
  • Kolekti ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Kolekti ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 342, "requestCorrelationId": "926cd0b35af74b5d"}