Versions Compared

Key

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

...

Code Block
languagebash
titleCreate Task Branch
# Ensure that you have the latest changes
git fetch --all

# Checkout source
git checkout -b TRAFODION-1507 origin/master   # or origin/releaseX.Y for a release patch

Change Recipes

How to make changes depends on what part of the source tree you are working on. Please refer to the following chapters:

...

The Trafodion Automated Tests are triggered to run on every pull request. These tests take several 1-2 hours to run. We always run these tests even if you’ve changed Shorter tests run if you've changed only documentation or the web site to ensure that no inadvertent change to the rest of the source tree occurred as part of your changes. Please refer to Automated Tests for information about how to check the outcome of these tests.

...

Please refer to https://help.github.com/articles/creating-a-pull-request/ for more documentation.

Using Git

...

Command Line (with Hub extension) 

Do the following:

Code Block
languagebash
titleGit Bash Pull Request
# Generate pull request
git pull-request

...

The pull request gets reviewed by the committers and once other contributors. Once you get a consensus, then the committer merges your changes into the main target incubator-trafodion branch. Check your e-mail for comments.

...

  1. Check out the code: git checkout TRAFODION-1507
  2. Make the requested changes.
  3. Run regression tests, if applicable.
  4. Commit the changes with appropriate change information: git commit -a
  5. Push the changes back to your private git fork: git push trafdeveloper_fork TRAFODION-1507
Info

The push command automatically adds the change to the active pull request.

Warning

Do not use the git commit --amend commans; use the procedure as documented above or git rebase command after pushing a commit.

Change Merge

If all is well, a committer will merge your change into the Apache repository, which is mirrored on GitHub. You may be asked to close out the JIRA or other follow up.

Your change is done. Thanks for your contribution to Trafodion.

...