Versions Compared

Key

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

...

With the required number of approvals, a committer (any committer can do this including the one that committed the patch) can now make the change to the code base. Here are the recommended steps for committing:

  • make sure the code is up-to-date
    • git fetch
  • check out the correct branch
    • git checkout -b branch_namesvn update
  • apply the patch
    • patch -p0 < path_to_patch

...

  • edit the CHANGES.TXT file and put the jiras that correspond to the patch in the appropriate section. add the Jira number. description (contributor via committer). a convention has emerged of using the committers id for brevity, but using the full names of non-committers.
  • svn git commit the changes
  • 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.

...