Versions Compared

Key

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

...

  • apply the patch
    • patch -p0 < path_to_patch
  • Please make sure you run the tests are your machine as a final check before you commit using mvn clean test.
    • In case the mvn clean test is failing please do not commit. File a JIRA and ping the person who has committed the last patch on the branch you are committing to and politely ask him to revert. The committer responsible for the broken build can either choose to fix or revert the patch. This is quite important since broken unit tests can cause a lot of churn and confusion for other developers. Its best to keep the trunk/builds healthy.
  • git commit the changes. The comment should looks like "AMBARI-1234. JIRA title. (contributor via committer)"; a convention has emerged of using the committers id for brevity, but using the full names of non-committers for the contributor part
  • git pull --rebase
  • git push origin <local-branchname>:<remote-branchname>
  • resolve (make sure you "resolve" and not "close".) the jiras that correspond to the patch and put the commit message (that one that has the new revision number) in the resolution comment field.

...