Thanks for your input, Bobby.
If no one objects I'll create a DEVELOPER.md in the top-level git repo
directory and add the information below to the file (plus adding further
stub questions). That should be the least intrusive way to add such
info to the existing doc/README setup.
Best,
Michael
On 28.04.2014 16:28, Bobby Evans wrote:
Yes, we totally should make this information a lot more accessible.
I¹m
not sure I can answer all of the questions either, but I can say what
I
have been doing and hopefully it helps.
Committers that are integrating patches/pull requests should use
https://git-wip-us.apache.org/repos/asf/incubator-storm.git
git will prompt you for your username and password on a push. Use
your
apache user name and password.
Regular pull requests should be done against
https://github.com/apache/incubator-storm
And should have the JIRA number (STORM-Š) in the title of the pull
request. An asf bot runs periodically to merge changes in the apache
repo
to github, and comments in the pull request to JIRA.
To pull in a merge request a committer should generally follow the
command
line instructions send out by github.
Checkout the master branch and make sure it is up to date, then
git pull <remote_repo> <remote_branch>
Assuming that it merges without any conflicts update CHANGELOG.md and
add
in the JIRA number+description to the file.
(Generally in both cases it is probably a good idea to place the JIRA
number in the commit comments.)
Then run any sanity tests that you think are needed, and push the
changes
back to the apache repo.
After that go to JIRA and resolve the JIRA. Be sure to set the Fix
Version/s field to be the version you checked it into. It is usually
good
practice to thank the author for their contribution fi you have not
done
so already.
Pull requests are approved with two +1s from committers and need to
be up
for at least 72 hours for all committers to have a chance to comment.
Although there has also been some discussion that we need to formalize
this in a set of project bylaws.
Hope this helps.
‹Bobby
On 4/28/14, 2:32 AM, "Michael G. Noll" <[email protected]>
wrote:
Hi all,
I noticed that there is not yet a lot of information for new Storm
committers regarding the development workflow, and I have remember at
least one other (newly added) committer who had the very same
question.
For instance, which git repo is "the" repo to use [1]? How should
one
go about merging pull requests that are being sent to the git repo
mirror on GitHub? Where should one /open/ a pull request, on the git
repo mirror on GitHub? And what's the role of Storm's JIRA instance,
and the ASF Git bot in there? What's the policy on approving pull
requests (number of +1's etc.)? What's the difference of the Apache
git
repo at [1], the GitHub mirror at [3], and the "second" Apache git
repo
at [4]? I could go on. :-)
The little pieces of information that I could compile are from
digging
through the mailing list archive. I think it would be a big help if
we
structure this information and add it to our docs. One possible
location for this kind of information would be the README file [2].
Since I have to go through this information anyways I'm happy to
compile
such information and put it somewhere (e.g. into the README), but I
have
to admit I don't know all the answers to the many questions I have.
:-)
Best,
Michael
[1] AFAIK the authoritative git repo is
https://git-wip-us.apache.org/repos/asf/incubator-storm.git.
[2]
https://github.com/apache/incubator-storm/blob/master/README.markdown
[3] https://github.com/apache/incubator-storm/
[4] http://git.apache.org/incubator-storm.git/, linked from
http://git.apache.org/
