Hi Adel, Sorry, no, that and everything from the bit about the GitHub PR merge button was essentially meant for other committers, i.e. folks ultimately interacting with the qpid svn repository though based on prior experience/discussion probably through using git-svn to do their work locally first.
Robbie On 30 January 2017 at 15:23, Adel Boutros <adelbout...@live.com> wrote: > Hello Robbie, > > > I don't know if your question "asuming you are actually using git-svn, which > I believe many/most folks are?" was addressed to me or not. > > However, in our case we use basically Atlassian Stash (now known as Bitbucket > Server) when mirroring the Qpid repositories. > > > Regards, > > Adel > > ________________________________ > From: Robbie Gemmell <robbie.gemm...@gmail.com> > Sent: Monday, January 30, 2017 2:19:24 PM > To: users@qpid.apache.org > Subject: Re: Patch + jira vs pull request > > Saying that made me look, and it seems like the GitHub integration is > indeed not enabled on the apache/qpid-java mirror. There are a few old > open Pull Requests and one test PR open+closed (nice account Lorenz > :P), none of which have been visible on the list. I raised > https://issues.apache.org/jira/browse/INFRA-13422 to get the GitHub > mails/JIRA comments integration enabled for the repo. > > Robbie > > On 30 January 2017 at 12:28, Robbie Gemmell <robbie.gemm...@gmail.com> wrote: >> JIRA+PR or JIRA+patch, either approach is fine and works out largely >> the same for us in the end (almost identical if you really want, since >> you can get a patch by adding .patch to github pr/diff/commit URLs). >> >> Assuming the 'GitHub integration' stuff is enabled (and if it isn't, >> that would be an oversight) on the particular GitHub mirror in >> question, raising a PR generates a mail to the dev@ mailing list, and >> if the JIRA key is in the PR title (e.g "QPID-1234:short description") >> then a comment will also be placed on the JIRA for the open/close and >> any PR comments. The JIRA key should also be included in the commit so >> that once merged the JIRA is updated with details of the actual commit >> (see existing commits/JIRAs). We cant click the typical 'merge pr' >> button on GitHub at this time, as the mirrors are read only, but we >> can add the mirrors as remotes for our existing checkouts and >> merge+push PR commits to the source repo which then get mirrored >> similarly. PRs are marked merged automatically if their commit history >> became the unmodified head at the time of merge, but more safely can >> be closed out by a commit (either the specific one with the changes, >> or a merge commit introducing the original, or just an empty commit) >> containing a "This closes #<PR>" message somewhere in their log. The >> PR process for the ASF's GitHub mirrors works essentially the same for >> the svn based repos as it does for the Git based repos (asuming you >> are actually using git-svn, which I believe many/most folks are?). >> >> Robbie >> >> On 30 January 2017 at 11:51, Lorenz Quack <quack.lor...@gmail.com> wrote: >>> I think it is different for different components of Qpid. >>> >>> The Qpid broker for Java for example has not migrated its main repository to >>> git. >>> Also the GitHub mirror is treated as read-only. And it is quite possible >>> that pull request might go unnoticed. >>> So, for the Qpid broker for Java component I would recommend for the time >>> being to use JIRA/patches/email. >>> >>> Kind regards, >>> Lorenz >>> >>> >>> On 30/01/17 10:56, Chris Richardson wrote: >>>> >>>> I have been wondering about this too and would definitely give a +1 to the >>>> pull request approach if it's an option. >>>> >>>> /C >>>> >>>> >>>> On 28 January 2017 at 08:51, Adel Boutros <adelbout...@live.com> wrote: >>>> >>>>> Hello, >>>>> >>>>> For some time we have been submitting jira issues with patches for >>>>> problems we have detected. However, it is also possible to perform a pull >>>>> request on the github repositories. >>>>> >>>>> So I was wondering which method you prefer and why? >>>>> >>>>> Regards, >>>>> Adel >>>>> >>>> >>>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org >>> For additional commands, e-mail: users-h...@qpid.apache.org >>> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org > For additional commands, e-mail: users-h...@qpid.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscr...@qpid.apache.org For additional commands, e-mail: users-h...@qpid.apache.org
