Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Removed ".txt" suffix from patch file names, since a ".patch" suffix is sufficient and an additional ".txt" will cause the pre-commit tests not to run

...

Code Block
svn diff > HIVE-1234.1.patch.txt

This will report all modifications done on Hive sources on your local disk and save them into the HIVE-1234.1.patch.txt file file. Read the patch file. Make sure it includes ONLY the modifications required to fix a single issue.

...

Code Block
git diff --no-prefix <commit> > HIVE-1234.1.patch.txt

Please do not:

  • reformat code unrelated to the bug being fixed: formatting changes should be separate patches/commits.
  • comment out code that is now obsolete: just remove it.
  • insert comments around each change, marking the change: folks can use subversion to figure out what's changed and by whom.
  • make things public which are not required by end users.

...

For patch updates, our convention is to number them like HIVE-1856.1.patch.txt, HIVE-1856.2.patch.txt, etc. And then click the "Submit Patch" button again when a new one is uploaded; this makes sure it gets back into the review queue. Appending '.txt' to the patch file name makes it easy to quickly view the contents of the patch in a web browser.

Applying a Patch

To apply a patch that you either generated or found from JIRA, you can issue:

...