Versions Compared

Old Version 6

changes.mady.by.user Dan Smith

Saved on

compared with

New Version Current

changes.mady.by.user Anthony Baker

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
1) file JIRA ticket GEODE-nnFile a GEODE JIRA ticket on Apache JIRA
Note: JIRA automatically assigns the name GEODE-nn where nn is the actual ticket number
.  Anyone can register for an account and create an issue.

2) Assign 2) assign ticket to yourself (click "Assign to me" in JIRA).  If you are not a committer, you will need to ask for JIRA 'contributor' permissions.  Send an email to dev@geode.apache.org with your JIRA username requesting access.

3)  change Change ticket status from OPEN to IN PROGRESS (click "Start Progress" in JIRA).

4) cd to geode checkout

 

Code Block
cd gemfire/open

 

5) start the feature branch for GEODE-nn

 

Code Block
git flow feature start GEODE-nn

 

Without git flow:
git checkout develop
git pull --rebase
git checkout -b feature/GEODE-nn
6) work on the changes and tests for GEODE-nn (include GEODE-nn in commit messages)
7) [optional] publish the feature branch to share with others or other machine

 

Code Block
git flow feature publish GEODE-nn

 

Without git flow:
git push -u origin feature/GEODE-nn
8) [optional] access feature branch from other machine

 

Code Block
git flow feature track GEODE-nn

 

Without git flow:
git fetch
git checkout feature/GEODE-nn
git pull
9) [optional] merge and rebase latest changes on develop to feature branch
Short lived branches where you are the only committer:

 

Code Block
git fetch
git rebase origin/develop

 

Long lived branches with many committers

 

Code Block
git fetch
git merge origin/develop

 

10) submit review on Apache Reviews via the rbt command-line tool

...

 

Code Block
git config reviewboard.url https://reviews.apache.org/

 

...

 

Code Block
rbt post --repository geode

 

11) [alternative] use Apache Reviews web page to submit review for "geode"

 

Code Block
git diff origin/develop...HEAD > GEODE-nn.diff

 

click New Review Request

  • select "geode"
  • click "Select" and choose diff file to upload
  • fill in information (TODO)
  • add group and users for review
  • "publish" the review

12) update develop in local repository

 

Code Block
git checkout develop
git pull --rebase

 

 

13) finish feature branch for GEODE-nn
For a short lived feature branch with a few changes that you want to look like individual commits on develop (most branches should use this):

 

Code Block
git flow feature finish -r GEODE-nn
git rebase -i

 

Without git flow:
git fetch
git checkout feature/GEODE-nn
git rebase -i origin/develop
git checkout develop
git merge feature/GEODE-nn
git branch -D feature/GEODE-nn
git push --delete origin feature/GEODE-nn
For a long lived branch where you want to see the merge history with develop:

 

Code Block
git flow feature finish --no-ff GEODE-nn

 

Without git flow:
git checkout develop
git pull
git merge --no-ff feature/GEODE-nn
git branch -D feature/GEODE-nn
git push --delete origin feature/GEODE-nn
If you have done a bunch of merges from develop to your feature branch, but you still want to see only a single commit on develop, you can do a squash merge to develop:

 

Code Block
git flow feature finish -S GEODE-nn

 

Follow the same steps as described on Code contributions. If you are committer, once someone has reviewed your pull request you can merge it yourself.
Without git flow:
git checkout develop
git pull
git merge --squash feature/GEODE-nn
git branch -D feature/GEODE-nn
git push --delete origin feature/GEODE-nn
14) push

 

Code Block
git push

 

...

5) Change ticket status of the JIRA ticket

 from IN PROGRESS to RESOLVED (click "Resolve Issue" and fill in details). Fill in the "Fixed in Version" to match the next release version. If you are not sure about what the next release version is, you can double check gradle.properties - the next version will be versionNumber.releaseType.