diff --git src/main/docbkx/developer.xml src/main/docbkx/developer.xml index de2f6a1..154c284 100644 --- src/main/docbkx/developer.xml +++ src/main/docbkx/developer.xml @@ -44,6 +44,12 @@ svn co http://svn.apache.org/repos/asf/hbase/trunk hbase-core-trunk git clone git://git.apache.org/hbase.git + + There is also a github repository that mirrors Apache git repository. If you'd like to develop within github environment (collaborating, pull requests) you can get the source code by: + +git clone git://github.com/apache/hbase.git + + @@ -990,6 +996,13 @@ mvn compile Please submit one patch-file per Jira. For example, if multiple files are changed make sure the selected resource when generating the patch is a directory. Patch files can reflect changes in multiple files. + + Generating patches using git: + +$ git diff --no-prefix > HBASE_XXXX.patch + + Don't forget the 'no-prefix' option; and generate the diff from the root directory of project + Make sure you review for code style.
@@ -997,7 +1010,7 @@ mvn compile The patch file should have the Apache HBase Jira ticket in the name. For example, if a patch was submitted for Foo.java, then a patch file called Foo_HBASE_XXXX.patch would be acceptable where XXXX is the Apache HBase Jira number. - If you generating from a branch, then including the target branch in the filename is advised, e.g., HBASE-XXXX-0.90.patch. + If you generating from a branch, then including the target branch in the filename is advised, e.g., HBASE_XXXX-0.90.patch.
@@ -1161,6 +1174,76 @@ Bar bar = foo.getBar(); <--- imagine there's an extra space(s) after the
+
+ Submitting a patch again + + Sometimes committers ask for changes for a patch. After incorporating the suggested/requested changes, follow the following process to submit the patch again. + + + + Do not delete the old patch file + + + version your new patch file using a simple scheme like this: + HBASE-{jira number}-{version}.patch + e.g: + HBASE_XXXX-v2.patch + + + 'Cancel Patch' on JIRA.. bug status will change back to Open + + + Attach new patch file (e.g. HBASE_XXXX-v2.patch) using 'Files --> Attach' + + + Click on 'Submit Patch'. Now the bug status will say 'Patch Available'. + + + Committers will review the patch. Rinse and repeat as many times as needed :-) +
+ +
+ Submitting incremental patches + + At times you may want to break a big change into mulitple patches. Here is a sample work-flow using git + + + patch 1: + + + $ git diff --no-prefix > HBASE_XXXX-1.patch + + + + + patch 2: + + + create a new git branch + $ git checkout -b my_branch + + + save your work + $ git add file1 file2 + $ git commit -am 'saved after HBASE_XXXX-1.patch' + now you have your own branch, that is different from remote master branch + + + make more changes... + + + create second patch + $ git diff --no-prefix > HBASE_XXXX-2.patch + + + + + + + + +
+
ReviewBoard Larger patches should go through ReviewBoard.