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 AkiraAjisaka
Date Thu, 23 Jun 2016 16:52:12 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 AkiraAjisaka:
https://wiki.apache.org/hadoop/HowToCommit?action=diff&rev1=36&rev2=37

Comment:
Committer need to update CHANGES.txt when backporting to branch-2.7 or older branches.

   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>}}}.
   1. '''Backporting to other branches:''' If the changes were to trunk, we might want to
apply them to other appropriate branches. 
      1. Cherry-pick the changes to other appropriate branches via {{{git cherry-pick -x <commit-hash>}}}.
The -x option records the source commit, and reuses the original commit message. Resolve any
conflicts.
-     1. If the conflicts are major, it is preferable to produce a new patch for that branch,
review it separately and commit it. When committing an edited patch to other branches, please
follow the same steps and make sure to include the JIRA number and description of changes
in the commit message. 
+     1. If the conflicts are major, it is preferable to produce a new patch for that branch,
review it separately and commit it. When committing an edited patch to other branches, please
follow the same steps and make sure to include the JIRA number and description of changes
in the commit message.
+     1. When backporting to branch-2.7 or older branches, we need to update CHANGES.txt.
   1. Resolve the issue as fixed, thanking the contributor.  Always set the "Fix Version"
at this point, but please only set a single fix version, the earliest release in which the
change will appear. '''Special case'''- when committing to a ''non-mainline'' branch (such
as branch-0.22 or branch-0.23 ATM), please set fix-version to either 2.x.x or 3.x.x appropriately
too.
   1. Set the assignee if it is not set. If you cannot set the contributor to the assignee,
you need to add the contributor into Contributors role in the project. Please see [[#Roles|Adding
Contributors role]] for the detail.
  

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message