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 MattFoley
Date Mon, 19 Sep 2011 18:14:05 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 MattFoley:

   1. Commit the changes to trunk and note down the revision number, say 4001. (Revision number
is displayed as response to your ''svn commit'' command).
   2. Check out the desired branch and execute this command from the root directory. {{{
  svn merge -r 4000:4001 https://svn.apache.org/repos/asf/hadoop/common/trunk .
- svn commit
+ # Now resolve any merge conflicts.  
+ # If major edits are needed, produce a new patch and upload it to the Jira.
+ svn diff CHANGES.txt # get all Jira numbers included in this merge
+ svn commit -m "merge <list all Jira numbers here>"
+ Please be sure to include Jira number(s) in the commit message for merge commits.  Sometimes
developers just put something like "merge -r 4000:4001" in the merge message, which fails
to trigger the Jira/Subversion integration, so the Jira doesn't record the branch commit.
 It is important to link to the Jira number, so that when looking at the Jira it will be clear
that this patch has been merged to this branch.
  == Patches that break HDFS and MapReduce ==

View raw message