jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add a simple backport policy to README.GIT

Browse Source 
This will clarify where patches should go, and who can do backports.

Reviewed-on: http://gerrit.openafs.org/8075
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 8662592cae)

Change-Id: I1d2c452dd17c8ae63eebfd8d800659c9de0fc327
Reviewed-on: http://gerrit.openafs.org/9684
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Ken Dreyer 2012-09-10 11:20:26 -06:00 committed by Stephan Wiesand
parent 0d76f5b07f
commit 30ec61f2ee
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.GIT
View File

@ -58,3 +58,24 @@ that way. Do this by sending mail to openafs-bugs@openafs.org with the
patch attached. But please use Gerrit if you can; patches sent in as bugs
will have to be forwarded to Gerrit by someone else, and it's easier for
everyone if you can enter them into Gerrit yourself.
Backport policy
------------
All patches should land on master first, unless the patch fixes a bug
that only exists in the stable branch.
Once a patch has been accepted into master, anyone can propose
backports to stable branches.
When cherry-picking a commit from another branch, please append a
"cherry picked from" section in your commit message. You'll also need
a separate Change-ID for Gerrit to recognize this as a separate
change. One workflow to do this:
1) Use "git cherry-pick -ex" to pick your commits onto another branch.
The -x option will append the appropriate "cherry picked from"
message, and the -e option will open your editor for you to edit
the commit message.
2) In your editor, delete the existing Change-ID line. Save and quit.
3) Run "git commit --amend", saving and quitting again. Git will run
the commit hook and generate a new Change-ID for Gerrit.