I updated the wiki to explain the rest of the process when discussion causes changes to the pull request:
Once the Pull Request is filed, there can be discussion on the PR. It is critical that any changes resulting from the discussion be first committed to the `ompi` repo on Github so they can be tested by the community prior to moving them to the release branch. Once the changes have been pushed to the `ompi` repo, the Pull Request should be updated and a commit message containing the revision's `master` hash added. This should be done at the time the changes are pushed to the `ompi` repo so tracking is maintained. On Oct 10, 2014, at 3:05 AM, Jeff Squyres (jsquyres) <jsquy...@cisco.com> wrote: > I just added this to the wiki > (https://github.com/open-mpi/ompi/wiki/SubmittingPullRequests): > > NOTE: Pull requests on ompi-release must include a hash reference in the > body/comments corresponding to the commit(s) onompi:master from which it is > derived. Specifically: the intent is that code only goes to the ompi-release > repository after it has been committed to the ompi:master development branch. > Normally, you can just list a Git hash in a PR body/comment, and Github will > auto-link it. But since since ompi:master is a different Github repository > than ompi-release, you must prefix hashes with open-mpi/<repo_name> so that > Github will know to link it to the other repo. For example: > > A commit in ompi:master: > open-mpi/ompi@ce8e33447ff342859c7ffd5216e8aa793d676428 > A commit in ompi-release:v1.8: > open-mpi/ompi-release@514ea9f6cc59bcd6426ec3f524ffdfb4279491e0 > > > > > On Oct 9, 2014, at 10:16 PM, Ralph Castain <r...@open-mpi.org> wrote: > >> Just include the master hash in a comment on the pull request - a link is >> preferred so I can quickly jump to the master-level commit. >> >> >> On Oct 9, 2014, at 6:12 PM, Howard Pritchard <hpprit...@gmail.com> wrote: >> >>> Hi Ralph, >>> >>> Just so its clear to everyone, what is the definition of "mark" in this >>> context? >>> >>> Howard >>> >>> >>> 2014-10-09 16:28 GMT-06:00 Ralph Castain <r...@open-mpi.org>: >>> Hi folks >>> >>> I would appreciate it if people marked their pull requests for the 1.8 >>> series with the commit hash from the devel "master" that contains the >>> corresponding trunk changeset. This will help me when checking MTT results >>> to see how that change behaved and whether (or not) it is ready to go into >>> 1.8. >>> >>> PR owners should retroactively do that as I won't be accepting PRs without >>> the "master" hash. >>> >>> Thanks >>> Ralph >>> >>> _______________________________________________ >>> devel mailing list >>> de...@open-mpi.org >>> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel >>> Link to this post: >>> http://www.open-mpi.org/community/lists/devel/2014/10/16034.php >>> >>> _______________________________________________ >>> devel mailing list >>> de...@open-mpi.org >>> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel >>> Link to this post: >>> http://www.open-mpi.org/community/lists/devel/2014/10/16035.php >> >> _______________________________________________ >> devel mailing list >> de...@open-mpi.org >> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel >> Link to this post: >> http://www.open-mpi.org/community/lists/devel/2014/10/16036.php > > > -- > Jeff Squyres > jsquy...@cisco.com > For corporate legal information go to: > http://www.cisco.com/web/about/doing_business/legal/cri/ > > _______________________________________________ > devel mailing list > de...@open-mpi.org > Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel > Link to this post: > http://www.open-mpi.org/community/lists/devel/2014/10/16037.php
