hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Hadoop Wiki] Update of "HowToCommit" by ChrisNauroth
Date Sat, 17 Oct 2015 22:17:16 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification.

The "HowToCommit" page has been changed by ChrisNauroth:
https://wiki.apache.org/hadoop/HowToCommit?action=diff&rev1=28&rev2=29

Comment:
Add more details about which section of CHANGES.txt to use for listing a patch.

  
  ==== Committing a patch ====
  When you commit a patch, please follow these steps:
-  1. '''CHANGES.txt:''' Add an entry in CHANGES.txt, at the end of the appropriate section.
This should include the JIRA issue ID, and the name of the contributor.
+  1. '''CHANGES.txt:''' Add an entry in CHANGES.txt, at the end of the appropriate section.
This should include the JIRA issue ID, and the name of the contributor. Attribution in CHANGES.txt
should fall under the earliest release that is receiving the patch, and it should be consistent
across all live branches. If the patch is targeted to 2.8.0, then its CHANGES.txt entry would
go in the 2.8.0 section on trunk and branch-2. If the patch is targeted to 2.7.2, then its
CHANGES.txt entry would go in the 2.7.2 section on trunk, branch-2 and branch-2.7.  When backporting
a patch that was previously committed for a later branch, please update its CHANGES.txt entry
on all branches for accuracy. Suppose a patch initially targets 2.8.0, but then later becomes
a candidate for 2.7.2. On the initial commit, it would have been listed under the 2.8.0 section
on trunk and branch-2. After the decision to backport to 2.7.2, go back and update CHANGES.txt
on all branches to match reality, moving it to the 2.7.2 section on trunk, branch-2 and branch-2.7.
   1. '''Commit locally:''' Commit the change locally to the appropriate branch (should be
''trunk'' if it is not a feature branch) using {{{git commit -a -m <commit-message>}}}.
The commit message should include the JIRA issue id, along with a short description of the
change and the name of the contributor if it is not you. ''Note:'' Be sure to get the issue
id right, as this causes JIRA to link to the change in git (use the issue's "All" tab to see
these). Verify all the changes are included in the commit using {{{git status}}}. If there
are any remaining changes (previously missed files), please commit them and squash these commits
into one using {{{git rebase -i}}}.
   1. '''Pull latest changes from remote repo:''' Pull in the latest changes from the remote
branch using {{{git pull --rebase}}} (--rebase is not required if you have setup git pull
to always --rebase). Verify this didn't cause any merge commits using {{{git log [--pretty=oneline]}}}
   1. '''Push changes to remote repo:''' Build and run a test to ensure it is all still kosher.
Push the changes to the remote (main) repo using {{{git push <remote> <branch>}}}.

Mime
View raw message