[ https://issues.apache.org/jira/browse/HBASE-4593?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14088291#comment-14088291 ]
Misty Stanley-Jones commented on HBASE-4593: -------------------------------------------- >From an email from [~apurtell] {code} ---------- Forwarded message ---------- From: Andrew Purtell <apurt...@apache.org> Date: Fri, Aug 1, 2014 at 10:32 AM Subject: Friendly reminder to use git cherry-pick and git rebase instead of git merge To: "d...@hbase.apache.org" <d...@hbase.apache.org> We previously agreed to avoid merge commits appearing in our git history. Found a merge commit on 0.98 branch. Thanks! {code} > Design and document the official procedure for posting patches, commits, > commit messages, etc. to smooth process and make integration with tools easier > ------------------------------------------------------------------------------------------------------------------------------------------------------- > > Key: HBASE-4593 > URL: https://issues.apache.org/jira/browse/HBASE-4593 > Project: HBase > Issue Type: Task > Components: documentation > Reporter: Jonathan Gray > Assignee: Misty Stanley-Jones > > I have been building a tool (currently called reposync) to help me keep the > internal FB hbase-92-based branch up-to-date with the public branches. > Various inconsistencies in our process has made it difficult to automate a > lot of this stuff. > I'd like to work with everyone to come up with the official best practices > and stick to it. > I welcome all suggestions. Among some of the things I'd like to nail down: > - Commit message format > - Best practice and commit message format for multiple commits > - Multiple commits per jira vs. jira per commit, what are the exceptions and > when > - Affects vs. Fix versions > - Potential usage of [tags] in commit messages for things like book, scripts, > shell... maybe even whatever is in the components field? > - Increased usage of JIRA tags or labels to mark exactly which repos a JIRA > has been committed to (potentially even internal repos? ways for a tool to > keep track in JIRA?) > We also need to be more strict about some things if we want to follow Apache > guidelines. For example, all final versions of a patch must be attached to > JIRA so that the author properly assigns it to Apache. -- This message was sent by Atlassian JIRA (v6.2#6252)