You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/06/07 05:26:56 UTC
git commit: Add note on Amending-Author: Author
agreed up on mailing list
Repository: hbase
Updated Branches:
refs/heads/master c682d57e9 -> 31de89091
Add note on Amending-Author: Author <co...@apache> agreed up on mailing list
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/31de8909
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31de8909
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31de8909
Branch: refs/heads/master
Commit: 31de89091f38e063cb7bcf50265e8bc41ec6a650
Parents: c682d57
Author: Michael Stack <st...@duboce.net>
Authored: Fri Jun 6 20:26:34 2014 -0700
Committer: Michael Stack <st...@duboce.net>
Committed: Fri Jun 6 20:26:44 2014 -0700
----------------------------------------------------------------------
src/main/docbkx/developer.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/31de8909/src/main/docbkx/developer.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/developer.xml b/src/main/docbkx/developer.xml
index a063479..e6dc79d 100644
--- a/src/main/docbkx/developer.xml
+++ b/src/main/docbkx/developer.xml
@@ -1606,6 +1606,20 @@ If a committer wishes to improve an unacceptable patch, then it should first be
Be sure to get the issue id right, as this causes Jira to link to the change in Subversion (use the issue's "All" tab to see these). </para></listitem>
<listitem><para>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. </para></listitem></orderedlist><para><anchor id="Documentation"/> </para>
+
+ <section xml:id="committer.amending.author">
+ <title>Add Amending-Author when a conflict cherrypick backporting</title>
+ <para>
+ We've established the practice of committing to trunk and then
+ cherry picking back to branches whenever possible. When there is a minor
+ conflict we can fix it up and just proceed with the commit. The resulting commit
+ retains the original author. When the amending author is different from the
+ original committer, add notice of this at the end of the commit message as:
+ <varname>Amending-Author: Author <committer&apache></varname>
+ See discussion at <link xlink:href="http://search-hadoop.com/m/DHED4wHGYS">HBase, mail # dev - [DISCUSSION] Best practice when amending commits cherry picked from master to branch</link>.
+ </para>
+ </section>
+
<section xml:id="committer.tests">
<title>Committers are responsible for making sure commits do not break the build or tests</title>
<para>